Add ability for Widgets to override the DefaultThemeProvider

ui/views/widget/widget.h

 // 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.
 
 #ifndef UI_VIEWS_WIDGET_WIDGET_H_
 #define UI_VIEWS_WIDGET_WIDGET_H_
 
 #include <set>
 #include <stack>
 #include <vector>
@@ skipping 248 matching lines @@
     gfx::NativeWindow context;
     // If true, forces the window to be shown in the taskbar, even for window
     // types that do not appear in the taskbar by default (popup and bubble).
     bool force_show_in_taskbar;
     // Only used by X11, for root level windows. Specifies the res_name and
     // res_class fields, respectively, of the WM_CLASS window property. Controls
     // window grouping and desktop file matching in Linux window managers.
     std::string wm_role_name;
     std::string wm_class_name;
     std::string wm_class_class;
+
+    // Specifies a theme_provider to be used in place of
+    // |default_theme_provider_|. Widget does not take ownership.
+    ui::ThemeProvider* theme_provider;
   };
 
   Widget();
   ~Widget() override;
 
   // Creates a toplevel window with no context. These methods should only be
   // used in cases where there is no contextual information because we're
   // creating a toplevel window connected to no other event.
   //
   // If you have any parenting or context information, or can pass that
@@ skipping 598 matching lines @@
 
   // The focus manager keeping track of focus for this Widget and any of its
   // children.  NULL for non top-level widgets.
   // WARNING: RootView's destructor calls into the FocusManager. As such, this
   // must be destroyed AFTER root_view_. This is enforced in DestroyRootView().
   scoped_ptr<FocusManager> focus_manager_;
 
   // A theme provider to use when no other theme provider is specified.
   scoped_ptr<ui::DefaultThemeProvider> default_theme_provider_;
 
+  // The theme provider to use if specified. Otherwise |default_theme_provider_|
+  // is provided. This is not owned by Widget.

[sadrul, 2015/09/02 17:21:58]

is *used?

[jonross, 2015/09/02 18:35:40]

Done.

+  ui::ThemeProvider* theme_provider_;
+
   // Valid for the lifetime of RunShellDrag(), indicates the view the drag
   // started from.
   View* dragged_view_;
 
   // See class documentation for Widget above for a note about ownership.
   InitParams::Ownership ownership_;
 
   // See set_is_secondary_widget().
   bool is_secondary_widget_;
 
@@ skipping 59 matching lines @@
   bool movement_disabled_;
 
   ScopedObserver<ui::NativeTheme, ui::NativeThemeObserver> observer_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(Widget);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_WIDGET_H_