[MD] Don't use new OTR native-theming when using a custom browser theme.

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/debug/leak_annotations.h"
 #include "base/i18n/rtl.h"
 #include "build/build_config.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window_state.h"
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
 #include "chrome/browser/ui/views/frame/browser_root_view.h"
 #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 "ui/base/hit_test.h"
-#include "ui/base/theme_provider.h"
 #include "ui/events/event_handler.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/widget/native_widget.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ui/native_theme/native_theme_dark_aura.h"
 #endif
 
 #if defined(OS_LINUX)
 #include "chrome/browser/ui/views/frame/browser_command_handler_linux.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),
-      theme_provider_(
-          &ThemeService::GetThemeProviderForProfile(browser_view_->browser()
-                                                        ->profile())) {
+      browser_view_(browser_view) {
   browser_view_->set_frame(this);
   set_is_secondary_widget(false);
   // Don't focus anything on creation, selecting a tab will set the focus.
   set_focus_on_creation(false);
 }
 
 BrowserFrame::~BrowserFrame() {
 }
 
 // static
 const gfx::FontList& BrowserFrame::GetTitleFontList() {
   static const gfx::FontList* title_font_list = new gfx::FontList();
   ANNOTATE_LEAKING_OBJECT_PTR(title_font_list);
   return *title_font_list;
 }
 
 void BrowserFrame::InitBrowserFrame() {
   native_browser_frame_ =
       NativeBrowserFrameFactory::CreateNativeBrowserFrame(this, browser_view_);
   views::Widget::InitParams params = native_browser_frame_->GetWidgetParams();
   params.delegate = browser_view_;
   if (browser_view_->browser()->is_type_tabbed()) {
     // Typed panel/popup can only return a size once the widget has been
     // created.
     chrome::GetSavedWindowBoundsAndShowState(browser_view_->browser(),
                                              &params.bounds,
                                              &params.show_state);
   }
 
-  if (browser_view_->browser()->profile()->GetProfileType() ==
-      Profile::INCOGNITO_PROFILE) {
-#if defined(OS_WIN)
-    params.native_theme = ui::NativeThemeDarkWin::instance();
-#elif defined(OS_CHROMEOS)
-    params.native_theme = ui::NativeThemeDarkAura::instance();
-#endif
-  }
-
   Init(params);
 
   if (!native_browser_frame_->UsesNativeSystemMenu()) {
     DCHECK(non_client_view());
     non_client_view()->set_context_menu_controller(this);
   }
 
 #if defined(OS_LINUX)
   browser_command_handler_.reset(new BrowserCommandHandlerLinux(browser_view_));
 #endif
@@ skipping 63 matching lines @@
       chrome::CreateBrowserNonClientFrameView(this, browser_view_);
   return browser_frame_view_;
 }
 
 bool BrowserFrame::GetAccelerator(int command_id,
                                   ui::Accelerator* accelerator) const {
   return browser_view_->GetAccelerator(command_id, accelerator);
 }
 
 const ui::ThemeProvider* BrowserFrame::GetThemeProvider() const {
-  return theme_provider_;
+  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)
+    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.
   if (browser_view_ &&
       browser_view_->immersive_mode_controller()->IsRevealed()) {
     // This function should not be reentrant because the TopContainerView
     // paints to a layer for the duration of the immersive reveal.
@@ skipping 66 matching lines @@
 
 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() {
   return browser_frame_view_->avatar_button();
 }
 
 #if defined(FRAME_AVATAR_BUTTON)
 views::View* BrowserFrame::GetNewAvatarMenuButton() {
   return browser_frame_view_->new_avatar_button();
 }
 #endif