diff options
Diffstat (limited to 'views/widget')
-rw-r--r-- | views/widget/widget.h | 8 | ||||
-rw-r--r-- | views/widget/widget_win.cc | 8 |
2 files changed, 5 insertions, 11 deletions
diff --git a/views/widget/widget.h b/views/widget/widget.h index 14a61a0..efa16c5 100644 --- a/views/widget/widget.h +++ b/views/widget/widget.h @@ -104,10 +104,10 @@ class Widget { // Get the theme provider. virtual ThemeProvider* GetThemeProvider() const { return NULL; } - // Get the default theme provider; this is necessary for when a widget has - // no profile (and ThemeProvider) associated with it. The default theme - // provider provides a default set of bitmaps that such widgets can use. - virtual ThemeProvider* GetDefaultThemeProvider() { return NULL; } + // Get the dialog theme provider; this is necessary for when a dialog has + // no profile (and ThemeProvider) associated with it. The dialog theme + // provider provides a default set of bitmaps that such dialogs can use. + virtual ThemeProvider* GetDialogThemeProvider() { return NULL; } }; } // namespace views diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc index c4aa1740..79ec700 100644 --- a/views/widget/widget_win.cc +++ b/views/widget/widget_win.cc @@ -396,13 +396,7 @@ TooltipManager* WidgetWin::GetTooltipManager() { ThemeProvider* WidgetWin::GetThemeProvider() const { Widget* widget = GetRootWidget(); if (widget) { - // Attempt to get the theme provider, and fall back to the default theme - // provider if not found. - ThemeProvider* provider = widget->GetThemeProvider(); - if (provider) - return provider; - - provider = widget->GetDefaultThemeProvider(); + ThemeProvider* provider = widget->GetDialogThemeProvider(); if (provider) return provider; } |