Browse Source

Update linux/win menu_bar.h

Chromium Commit https://chromium.googlesource.com/chromium/src/+/6a2f2686a9c91616b82abb5dd5b5fa42c6b95ca8
Nitish Sakhawalkar 6 years ago
parent
commit
85bb488732
2 changed files with 6 additions and 7 deletions
  1. 4 5
      atom/browser/ui/views/menu_bar.cc
  2. 2 2
      atom/browser/ui/views/menu_bar.h

+ 4 - 5
atom/browser/ui/views/menu_bar.cc

@@ -286,9 +286,8 @@ void MenuBar::OnMenuButtonClicked(views::Button* source,
   menu_delegate->AddObserver(this);
 }
 
-void MenuBar::RefreshColorCache(const ui::NativeTheme* theme) {
-  if (!theme)
-    theme = ui::NativeTheme::GetInstanceForNativeUi();
+void MenuBar::RefreshColorCache() {
+  const ui::NativeTheme* theme = GetNativeTheme();
   if (theme) {
 #if defined(USE_X11)
     background_color_ = libgtkui::GetBgColor("GtkMenuBar#menubar");
@@ -306,8 +305,8 @@ void MenuBar::RefreshColorCache(const ui::NativeTheme* theme) {
 #endif
 }
 
-void MenuBar::OnNativeThemeChanged(const ui::NativeTheme* theme) {
-  RefreshColorCache(theme);
+void MenuBar::OnThemeChanged() {
+  RefreshColorCache();
   UpdateViewColors();
 }
 

+ 2 - 2
atom/browser/ui/views/menu_bar.h

@@ -82,7 +82,7 @@ class MenuBar : public views::AccessiblePaneView,
   void OnMenuButtonClicked(views::Button* source,
                            const gfx::Point& point,
                            const ui::Event* event) override;
-  void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
+  void OnThemeChanged() override;
 
  private:
   friend class MenuBarColorUpdater;
@@ -90,7 +90,7 @@ class MenuBar : public views::AccessiblePaneView,
   void RebuildChildren();
   void UpdateViewColors();
 
-  void RefreshColorCache(const ui::NativeTheme* theme = nullptr);
+  void RefreshColorCache();
   SkColor background_color_;
 #if defined(USE_X11)
   SkColor enabled_color_;