[MD] Implement incognito colors as a NativeTheme (for Aura).

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 "base/debug/leak_annotations.h"
 #include "base/i18n/rtl.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/themes/theme_service.h"
@@ skipping 13 matching lines @@
 #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_(ThemeServiceFactory::GetForProfile(
                           browser_view_->browser()->profile())) {
@@ skipping 105 matching lines @@
 
 bool BrowserFrame::GetAccelerator(int command_id,
                                   ui::Accelerator* accelerator) const {
   return browser_view_->GetAccelerator(command_id, accelerator);
 }
 
 ui::ThemeProvider* BrowserFrame::GetThemeProvider() const {
   return theme_provider_;
 }
 
+const ui::NativeTheme* BrowserFrame::GetNativeTheme() const {

[sky, 2015/11/16 16:10:17]

You sure you don't want to specify the NativeTheme as an init param? Less
subclassing.

[Evan Stade, 2015/11/16 17:52:25]

Isn't it the same amount of subclassing? These two widgets already are
subclasses. But if you prefer it as an init param I can change it (my previous
arguments against it are no longer relevant).

+  if (browser_view_->browser()->profile()->IsOffTheRecord()) {
+#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.
     views::View* top_container = browser_view_->top_container();
     CHECK(top_container->layer());
@@ skipping 64 matching lines @@
 
 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() {
   return browser_frame_view_->avatar_button();
 }
 
 #if defined(FRAME_AVATAR_BUTTON)
 NewAvatarButton* BrowserFrame::GetNewAvatarMenuButton() {
   return browser_frame_view_->new_avatar_button();
 }
 #endif