Rejigger ThemeService: move exposure of ThemeProvider interface to a

chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.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_desktop_window_tree_host_x11.h"
 
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/theme_image_mapper.h"
 
 namespace {
 
 // DesktopThemeProvider maps resource ids using MapThemeImage(). This is
 // necessary for BrowserDesktopWindowTreeHostWin so that it uses the windows
 // theme images rather than the ash theme images.
 //
 // This differs from the version in browser_desktop_window_tree_host_win.cc
 // because we need to also look up whether we're using the native theme.
 class DesktopThemeProvider : public ui::ThemeProvider {
  public:
-  explicit DesktopThemeProvider(ThemeService* delegate)
-      : delegate_(delegate) {
-  }
+  explicit DesktopThemeProvider(Profile* profile) : profile_(profile) {}
 
-  bool UsingSystemTheme() const override {
-    return delegate_->UsingSystemTheme();
-  }
   gfx::ImageSkia* GetImageSkiaNamed(int id) const override {
-    if (delegate_->UsingSystemTheme() && delegate_->HasCustomImage(id))
-      return delegate_->GetImageSkiaNamed(id);
+    if (GetThemeService()->UsingSystemTheme() &&
+        GetThemeProvider().HasCustomImage(id)) {
+      return GetThemeProvider().GetImageSkiaNamed(id);
+    }
 
-    return delegate_->GetImageSkiaNamed(
+    return GetThemeProvider().GetImageSkiaNamed(
         chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id));
   }
-  SkColor GetColor(int id) const override { return delegate_->GetColor(id); }
+  SkColor GetColor(int id) const override {
+    return GetThemeProvider().GetColor(id);
+  }
   int GetDisplayProperty(int id) const override {
-    return delegate_->GetDisplayProperty(id);
+    return GetThemeProvider().GetDisplayProperty(id);
   }
   bool ShouldUseNativeFrame() const override {
-    return delegate_->ShouldUseNativeFrame();
+    return GetThemeProvider().ShouldUseNativeFrame();
   }
   bool HasCustomImage(int id) const override {
-    return delegate_->HasCustomImage(
+    return GetThemeProvider().HasCustomImage(
         chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id));
   }
   base::RefCountedMemory* GetRawData(int id, ui::ScaleFactor scale_factor)
       const override {
-    return delegate_->GetRawData(id, scale_factor);
+    return GetThemeProvider().GetRawData(id, scale_factor);
   }
 
  private:
-  ThemeService* delegate_;
+  const ThemeService* GetThemeService() const {
+    return ThemeServiceFactory::GetForProfile(profile_);
+  }
+
+  const ui::ThemeProvider& GetThemeProvider() const {
+    return ThemeService::GetThemeProviderForProfile(profile_);
+  }
+
+  Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopThemeProvider);
 };
 
 } // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserDesktopWindowTreeHostX11, public:
 
 BrowserDesktopWindowTreeHostX11::BrowserDesktopWindowTreeHostX11(
     views::internal::NativeWidgetDelegate* native_widget_delegate,
     views::DesktopNativeWidgetAura* desktop_native_widget_aura,
     BrowserView* browser_view,
     BrowserFrame* browser_frame)
     : DesktopWindowTreeHostX11(native_widget_delegate,
                                desktop_native_widget_aura),
       browser_view_(browser_view) {
   scoped_ptr<ui::ThemeProvider> theme_provider(
-      new DesktopThemeProvider(ThemeServiceFactory::GetForProfile(
-                                   browser_view->browser()->profile())));
+      new DesktopThemeProvider(browser_view->browser()->profile()));
   browser_frame->SetThemeProvider(theme_provider.Pass());
   browser_frame->set_frame_type(
       browser_frame->UseCustomFrame() ? views::Widget::FRAME_TYPE_FORCE_CUSTOM
                                       : views::Widget::FRAME_TYPE_FORCE_NATIVE);
 }
 
 BrowserDesktopWindowTreeHostX11::~BrowserDesktopWindowTreeHostX11() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 40 matching lines @@
     BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost(
         views::internal::NativeWidgetDelegate* native_widget_delegate,
         views::DesktopNativeWidgetAura* desktop_native_widget_aura,
         BrowserView* browser_view,
         BrowserFrame* browser_frame) {
   return new BrowserDesktopWindowTreeHostX11(native_widget_delegate,
                                              desktop_native_widget_aura,
                                              browser_view,
                                              browser_frame);
 }