Remove MaterialDesignController::IsModeMaterial

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
 #include "chrome/browser/ui/views/frame/native_browser_frame.h"
 #include "chrome/browser/ui/views/frame/native_browser_frame_factory.h"
 #include "chrome/browser/ui/views/frame/system_menu_model_builder.h"
 #include "chrome/browser/ui/views/frame/top_container_view.h"
 #include "chrome/common/chrome_switches.h"
 #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)
 #include "chrome/browser/ui/views/frame/browser_command_handler_linux.h"
 #endif
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 #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:
 
 BrowserFrame::BrowserFrame(BrowserView* browser_view)
     : native_browser_frame_(nullptr),
       root_view_(nullptr),
       browser_frame_view_(nullptr),
       browser_view_(browser_view) {
   browser_view_->set_frame(this);
   set_is_secondary_widget(false);
@@ skipping 118 matching lines @@
 const ui::ThemeProvider* BrowserFrame::GetThemeProvider() const {
   return &ThemeService::GetThemeProviderForProfile(
       browser_view_->browser()->profile());
 }
 
 const ui::NativeTheme* BrowserFrame::GetNativeTheme() const {
   if (browser_view_->browser()->profile()->GetProfileType() ==
           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
   }
   return views::Widget::GetNativeTheme();
 }
 
 void BrowserFrame::SchedulePaintInRect(const gfx::Rect& rect) {
   views::Widget::SchedulePaintInRect(rect);
 
   // Paint the frame caption area and window controls during immersive reveal.
@@ skipping 76 matching lines @@
   return menu_model_builder_->menu_model();
 }
 
 views::View* BrowserFrame::GetNewAvatarMenuButton() {
   return browser_frame_view_->GetProfileSwitcherView();
 }
 
 void BrowserFrame::OnMenuClosed() {
   menu_runner_.reset();
 }