 716cb28430
			
		
	
	
	716cb28430
	
	
	
		
			
			* chore: bump chromium in DEPS to 1e9f9a24aa12bea9cf194a82a7e249bd1242ec4f * chore: update patches * Make WebContents' theme color a base::Optional<SkColor> https://chromium-review.googlesource.com/c/chromium/src/+/1540022 * update autofill patch for incorrect header includes * Move Shell messages to web_test and rename to BlinkTest. https://chromium-review.googlesource.com/c/chromium/src/+/1525181 * Make PlatformNotificationServiceImpl a KeyedService. https://chromium-review.googlesource.com/c/chromium/src/+/1336150 * Move MediaPlayerId to its own file. https://chromium-review.googlesource.com/c/chromium/src/+/1547057 * Remove net/base/completion_callback.h, which is no longer used https://chromium-review.googlesource.com/c/chromium/src/+/1552821 * AW NS: support file scheme cookies https://chromium-review.googlesource.com/c/chromium/src/+/1533486 * Remove SecurityInfo and adapt remaining consumers https://chromium-review.googlesource.com/c/chromium/src/+/1509455 * Remove deprecated type-specific number to string conversion functions https://chromium-review.googlesource.com/c/chromium/src/+/1545881 * DevTools: Adding new performance histograms for launch of top 4 tools https://chromium-review.googlesource.com/c/chromium/src/+/1506388 * Update include paths for //base/hash/hash.h https://chromium-review.googlesource.com/c/chromium/src/+/1544630 * build: Disable ensure_gn_version gclient hook for mac CI checkout * update patches * use maybe version of v8::String::NewFromTwoByte * bump appveyor image version * fix mac ci hopefully * Convert enum to enum class for MenuAnchorPosition https://chromium-review.googlesource.com/c/chromium/src/+/1530508 * use maybe version of ToObject * RenderViewHost::GetProcess is no longer const * Unrefcount AuthChallengeInfo https://chromium-review.googlesource.com/c/chromium/src/+/1550631 * MenuButtonController takes Button rather than MenuButton https://chromium-review.googlesource.com/c/chromium/src/+/1500935 * add //ui/views_bridge_mac to deps to fix link error * forward declare views::Button in atom::MenuDelegate * more v8 patches * base/{=> hash}/md5.h https://chromium-review.googlesource.com/c/chromium/src/+/1535124 * gfx::{PlatformFontWin => win}::* https://chromium-review.googlesource.com/c/chromium/src/+/1534178 * fix v8 patches * [base] Rename TaskScheduler to ThreadPool https://chromium-review.googlesource.com/c/chromium/src/+/1561552 * use internal_config_base for bytecode_builtins_list_generator avoids windows link errors * FIXME: temporarily disable v8/breakpad integration * FIXME: temporarily disable prevent-will-redirect test * FIXME: disable neon on aarch64 pending crbug.com/953815 * update to account for WebCursor refactor https://chromium-review.googlesource.com/c/chromium/src/+/1562755 * enable stack dumping on appveyor * Revert "FIXME: disable neon on aarch64 pending crbug.com/953815" This reverts commit 57f082026be3d83069f2a2814684abf4dc9e7b53. * fix: remove const qualifiers to match upstream * fix: remove const qualifiers to match upstream in cc files as well * don't throw an error when testing if an object is an object * use non-deprecated Buffer constructor * Remove net::CookieSameSite::DEFAULT_MODE enum value https://chromium-review.googlesource.com/c/chromium/src/+/1567955 * depend on modded dbus-native to work around buffer deprecation https://github.com/sidorares/dbus-native/pull/262 * revert clang roll to fix arm build on linux * fixup! depend on modded dbus-native to work around buffer deprecation need more coffee * update coffee-script * robustify verify-mksnapshot w.r.t. command-line parameters * Revert "robustify verify-mksnapshot w.r.t. command-line parameters" This reverts commit a49af01411f684f6025528d604895c3696e0bc57. * fix mksnapshot by matching args * update patches * TMP: enable rdp on appveyor * Changed ContentBrowserClient::CreateQuotaPermissionContext() to return scoped_refptr. https://chromium-review.googlesource.com/c/chromium/src/+/1569376 * Make content::ResourceType an enum class. https://chromium-review.googlesource.com/c/chromium/src/+/1569345 * fixup! Make content::ResourceType an enum class. * turn off rdp * use net::CompletionRepeatingCallback instead of base::Callback<void(int)> * remove disable_ensure_gn_version_gclient_hook.patch * copy repeating callback instead of std::move * fix lint * add completion_repeating_callback.h include
		
			
				
	
	
		
			114 lines
		
	
	
	
		
			3.2 KiB
			
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			114 lines
		
	
	
	
		
			3.2 KiB
			
		
	
	
	
		
			C++
		
	
	
	
	
	
| // Copyright (c) 2014 GitHub, Inc.
 | |
| // Use of this source code is governed by the MIT license that can be
 | |
| // found in the LICENSE file.
 | |
| 
 | |
| #ifndef ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
 | |
| #define ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
 | |
| 
 | |
| #include <memory>
 | |
| 
 | |
| #include "atom/browser/ui/atom_menu_model.h"
 | |
| #include "atom/browser/ui/views/menu_delegate.h"
 | |
| #include "atom/browser/ui/views/root_view.h"
 | |
| #include "ui/views/accessible_pane_view.h"
 | |
| #include "ui/views/controls/button/menu_button_listener.h"
 | |
| #include "ui/views/focus/focus_manager.h"
 | |
| #include "ui/views/view.h"
 | |
| 
 | |
| namespace views {
 | |
| class Button;
 | |
| class MenuButton;
 | |
| }  // namespace views
 | |
| 
 | |
| namespace atom {
 | |
| 
 | |
| class MenuBarColorUpdater : public views::FocusChangeListener {
 | |
|  public:
 | |
|   explicit MenuBarColorUpdater(MenuBar* menu_bar);
 | |
|   ~MenuBarColorUpdater() override;
 | |
| 
 | |
|   void OnDidChangeFocus(views::View* focused_before,
 | |
|                         views::View* focused_now) override;
 | |
|   void OnWillChangeFocus(views::View* focused_before,
 | |
|                          views::View* focused_now) override {}
 | |
| 
 | |
|  private:
 | |
|   MenuBar* menu_bar_;
 | |
| };
 | |
| 
 | |
| class MenuBar : public views::AccessiblePaneView,
 | |
|                 public views::MenuButtonListener,
 | |
|                 public atom::MenuDelegate::Observer {
 | |
|  public:
 | |
|   static const char kViewClassName[];
 | |
| 
 | |
|   explicit MenuBar(RootView* window);
 | |
|   ~MenuBar() override;
 | |
| 
 | |
|   // Replaces current menu with a new one.
 | |
|   void SetMenu(AtomMenuModel* menu_model);
 | |
| 
 | |
|   // Shows underline under accelerators.
 | |
|   void SetAcceleratorVisibility(bool visible);
 | |
| 
 | |
|   // Returns true if the submenu has accelerator |key|
 | |
|   bool HasAccelerator(base::char16 key);
 | |
| 
 | |
|   // Shows the submenu whose accelerator is |key|.
 | |
|   void ActivateAccelerator(base::char16 key);
 | |
| 
 | |
|   // Returns there are how many items in the root menu.
 | |
|   int GetItemCount() const;
 | |
| 
 | |
|   // Get the menu under specified screen point.
 | |
|   bool GetMenuButtonFromScreenPoint(const gfx::Point& point,
 | |
|                                     AtomMenuModel** menu_model,
 | |
|                                     views::MenuButton** button);
 | |
| 
 | |
|   // atom::MenuDelegate::Observer:
 | |
|   void OnBeforeExecuteCommand() override;
 | |
|   void OnMenuClosed() override;
 | |
| 
 | |
|   // views::AccessiblePaneView:
 | |
|   bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
 | |
|   bool SetPaneFocus(views::View* initial_focus) override;
 | |
|   void RemovePaneFocus() override;
 | |
| 
 | |
|  protected:
 | |
|   // views::View:
 | |
|   const char* GetClassName() const override;
 | |
| 
 | |
|   // views::MenuButtonListener:
 | |
|   void OnMenuButtonClicked(views::Button* source,
 | |
|                            const gfx::Point& point,
 | |
|                            const ui::Event* event) override;
 | |
|   void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
 | |
| 
 | |
|  private:
 | |
|   friend class MenuBarColorUpdater;
 | |
| 
 | |
|   void RebuildChildren();
 | |
|   void UpdateViewColors();
 | |
| 
 | |
|   void RefreshColorCache(const ui::NativeTheme* theme = nullptr);
 | |
|   SkColor background_color_;
 | |
| #if defined(USE_X11)
 | |
|   SkColor enabled_color_;
 | |
|   SkColor disabled_color_;
 | |
| #endif
 | |
| 
 | |
|   RootView* window_ = nullptr;
 | |
|   AtomMenuModel* menu_model_ = nullptr;
 | |
| 
 | |
|   View* FindAccelChild(base::char16 key);
 | |
| 
 | |
|   bool has_focus_ = true;
 | |
| 
 | |
|   std::unique_ptr<MenuBarColorUpdater> color_updater_;
 | |
| 
 | |
|   DISALLOW_COPY_AND_ASSIGN(MenuBar);
 | |
| };
 | |
| 
 | |
| }  // namespace atom
 | |
| 
 | |
| #endif  // ATOM_BROWSER_UI_VIEWS_MENU_BAR_H_
 |