Revert Revision 17224

BUG=none
TEST=non

Review URL: http://codereview.chromium.org/115951

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17245 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 7 insertions, 13 deletions

diff --git a/chrome/browser/views/frame/browser_frame_win.cc b/chrome/browser/views/frame/browser_frame_win.cc
index 505f28b..0e76a4d 100644
--- a/chrome/browser/views/frame/browser_frame_win.cc
+++ b/chrome/browser/views/frame/browser_frame_win.cc
@@ -90,7 +90,7 @@ ThemeProvider* BrowserFrameWin::GetThemeProvider() const {
   return profile_->GetThemeProvider();
 }
 
-ThemeProvider* BrowserFrameWin::GetDefaultThemeProvider() const {
+ThemeProvider* BrowserFrameWin::GetDialogThemeProvider() const {
   return profile_->GetThemeProvider();
 }
 
diff --git a/chrome/browser/views/frame/browser_frame_win.h b/chrome/browser/views/frame/browser_frame_win.h
index 64dc1c6..a3aa30d 100644
--- a/chrome/browser/views/frame/browser_frame_win.h
+++ b/chrome/browser/views/frame/browser_frame_win.h
@@ -44,7 +44,7 @@ class BrowserFrameWin : public BrowserFrame, public views::WindowWin {
 
   // Overridden from views::Widget.
   virtual ThemeProvider* GetThemeProvider() const;
-  virtual ThemeProvider* GetDefaultThemeProvider() const;
+  virtual ThemeProvider* GetDialogThemeProvider() const;
 
   BrowserView* browser_view() const { return browser_view_; }
 
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;
   }