Remove MaterialDesignController::IsModeMaterial

chrome/browser/ui/views/frame/browser_frame.cc

Index: chrome/browser/ui/views/frame/browser_frame.cc
diff --git a/chrome/browser/ui/views/frame/browser_frame.cc b/chrome/browser/ui/views/frame/browser_frame.cc
index c5ede6ab791459cdb27d0c4b7d72b6948a6efd68..eaeaa5a3b07c919b4cd56d5cce1c6603d8ba5735 100644
--- a/chrome/browser/ui/views/frame/browser_frame.cc
+++ b/chrome/browser/ui/views/frame/browser_frame.cc
@@ -28,13 +28,13 @@
 #include "ui/base/hit_test.h"
 #include "ui/events/event_handler.h"
 #include "ui/gfx/font_list.h"
+#include "ui/native_theme/native_theme_dark_aura.h"

[Peter Kasting, 2016/11/10 05:42:20]

Nit: I'd be inclined to leave this under an "if CHROMEOS || WIN", but whatever.

[Evan Stade, 2016/11/10 15:39:46]

Acknowledged.

 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/widget/native_widget.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/common/session/session_state_delegate.h"  // nogncheck
 #include "ash/common/wm_shell.h"  // nogncheck
-#include "ui/native_theme/native_theme_dark_aura.h"  // nogncheck
 #endif
 
 #if defined(OS_LINUX)
@@ -45,10 +45,6 @@
 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
 #endif
 
-#if defined(OS_WIN)
-#include "ui/native_theme/native_theme_dark_win.h"
-#endif
-
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserFrame, public:
 
@@ -187,9 +183,7 @@ const ui::NativeTheme* BrowserFrame::GetNativeTheme() const {
           Profile::INCOGNITO_PROFILE &&
       ThemeServiceFactory::GetForProfile(browser_view_->browser()->profile())
           ->UsingDefaultTheme()) {
-#if defined(OS_WIN)
-    return ui::NativeThemeDarkWin::instance();
-#elif defined(OS_CHROMEOS)
+#if defined(OS_WIN) || defined(OS_CHROMEOS)

[Peter Kasting, 2016/11/10 05:42:20]

Nit: This #if can now surround the entire conditional.

[Evan Stade, 2016/11/10 15:39:46]

Done.

     return ui::NativeThemeDarkAura::instance();
 #endif
   }