From 03ee12d13e9c756253bed4a9f96d405624bdf8b9 Mon Sep 17 00:00:00 2001
From: Nitish Sakhawalkar <nitsakh@icloud.com>
Date: Mon, 13 May 2019 16:52:31 -0700
Subject: [PATCH] Update linux/win menu_bar.h

Chromium Commit https://chromium.googlesource.com/chromium/src/+/6a2f2686a9c91616b82abb5dd5b5fa42c6b95ca8
---
 atom/browser/ui/views/menu_bar.cc | 9 ++++-----
 atom/browser/ui/views/menu_bar.h  | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/atom/browser/ui/views/menu_bar.cc b/atom/browser/ui/views/menu_bar.cc
index 5c75ffa4092e..422609007313 100644
--- a/atom/browser/ui/views/menu_bar.cc
+++ b/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();
 }
 
diff --git a/atom/browser/ui/views/menu_bar.h b/atom/browser/ui/views/menu_bar.h
index 875ea6c40364..f2c8ea4e0389 100644
--- a/atom/browser/ui/views/menu_bar.h
+++ b/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_;