Add ability for Widgets to override the DefaultThemeProvider

ui/views/widget/widget.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 "ui/views/widget/widget.h"
 
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 140 matching lines @@
 Widget::InitParams::~InitParams() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, public:
 
 Widget::Widget()
     : native_widget_(NULL),
       widget_delegate_(NULL),
       non_client_view_(NULL),
+      theme_provider_(nullptr),
       dragged_view_(NULL),
       ownership_(InitParams::NATIVE_WIDGET_OWNS_WIDGET),
       is_secondary_widget_(true),
       frame_type_(FRAME_TYPE_DEFAULT),
       disable_inactive_rendering_(false),
       widget_closed_(false),
       saved_show_state_(ui::SHOW_STATE_DEFAULT),
       focus_on_creation_(true),
       is_top_level_(false),
       native_widget_initialized_(false),
@@ skipping 564 matching lines @@
 
 const View* Widget::GetRootView() const {
   return root_view_.get();
 }
 
 bool Widget::IsVisible() const {
   return native_widget_->IsVisible();
 }
 
 ui::ThemeProvider* Widget::GetThemeProvider() const {
+  if (theme_provider_)
+    return theme_provider_;
   const Widget* root_widget = GetTopLevelWidget();
   if (root_widget && root_widget != this) {
     // Attempt to get the theme provider, and fall back to the default theme
     // provider if not found.
     ui::ThemeProvider* provider = root_widget->GetThemeProvider();
     if (provider)
       return provider;
 
     provider = root_widget->default_theme_provider_.get();
     if (provider)
       return provider;
   }
   return default_theme_provider_.get();
 }
 
+void Widget::SetThemeProvider(ui::ThemeProvider* theme_provider) {
+  theme_provider_ = theme_provider;

[sadrul, 2015/08/31 17:51:07]

If a Widget has a theme-provider, then there's no reason to create the
DefaultThemeProvider for the Widget in the first-place, right? So, would it make
sense to include an optional theme-provider in InitParams when initializaing the
Widget?

[jonross, 2015/09/01 13:44:30]

We would not need the DefaultThemeProvider if they are using an alternate theme.
I could move this to the InitParams instead, as long as it is fine having Init
params not owned by the Widget

+  if (non_client_view_)
+    non_client_view_->Layout();

[sadrul, 2015/08/31 17:51:07]

Should this just call ThemeChanged() instead? (the Views that want a re-layout
on theme-change should trigger that from OnThemeChanged() override)

+}
+
 const ui::NativeTheme* Widget::GetNativeTheme() const {
   return native_widget_->GetNativeTheme();
 }
 
 FocusManager* Widget::GetFocusManager() {
   Widget* toplevel_widget = GetTopLevelWidget();
   return toplevel_widget ? toplevel_widget->focus_manager_.get() : NULL;
 }
 
 const FocusManager* Widget::GetFocusManager() const {
@@ skipping 713 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views