Rejigger ThemeService: move exposure of ThemeProvider interface to a

chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.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_win.h"
 
 #include <dwmapi.h>
 
 #include "base/process/process_handle.h"
 #include "base/win/windows_version.h"
@@ skipping 16 matching lines @@
 
 namespace {
 
 const int kClientEdgeThickness = 3;
 
 // 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.
 class DesktopThemeProvider : public ui::ThemeProvider {
  public:
-  explicit DesktopThemeProvider(ui::ThemeProvider* delegate)
-      : delegate_(delegate) {
-  }
+  explicit DesktopThemeProvider(const ui::ThemeProvider& delegate)
+      : delegate_(delegate) {}
 
-  bool UsingSystemTheme() const override {
-    return delegate_->UsingSystemTheme();
-  }
   gfx::ImageSkia* GetImageSkiaNamed(int id) const override {
-    return delegate_->GetImageSkiaNamed(
+    return delegate_.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 delegate_.GetColor(id); }
   int GetDisplayProperty(int id) const override {
-    return delegate_->GetDisplayProperty(id);
+    return delegate_.GetDisplayProperty(id);
   }
   bool ShouldUseNativeFrame() const override {
-    return delegate_->ShouldUseNativeFrame();
+    return delegate_.ShouldUseNativeFrame();
   }
   bool HasCustomImage(int id) const override {
-    return delegate_->HasCustomImage(
+    return delegate_.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 delegate_.GetRawData(id, scale_factor);
   }
 
  private:
-  ui::ThemeProvider* delegate_;
+  const ui::ThemeProvider& delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopThemeProvider);
 };
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserDesktopWindowTreeHostWin, public:
 
 BrowserDesktopWindowTreeHostWin::BrowserDesktopWindowTreeHostWin(
     views::internal::NativeWidgetDelegate* native_widget_delegate,
     views::DesktopNativeWidgetAura* desktop_native_widget_aura,
     BrowserView* browser_view,
     BrowserFrame* browser_frame)
     : DesktopWindowTreeHostWin(native_widget_delegate,
                                desktop_native_widget_aura),
       browser_view_(browser_view),
       browser_frame_(browser_frame),
       did_gdi_clear_(false) {
   scoped_ptr<ui::ThemeProvider> theme_provider(
-      new DesktopThemeProvider(ThemeServiceFactory::GetForProfile(
-                                   browser_view->browser()->profile())));
+      new DesktopThemeProvider(ThemeService::GetThemeProviderForProfile(
+          browser_view->browser()->profile())));
   browser_frame->SetThemeProvider(theme_provider.Pass());
 }
 
 BrowserDesktopWindowTreeHostWin::~BrowserDesktopWindowTreeHostWin() {
 }
 
 views::NativeMenuWin* BrowserDesktopWindowTreeHostWin::GetSystemMenu() {
   if (!system_menu_.get()) {
     SystemMenuInsertionDelegateWin insertion_delegate;
     system_menu_.reset(
@@ skipping 244 matching lines @@
     BrowserDesktopWindowTreeHost::CreateBrowserDesktopWindowTreeHost(
         views::internal::NativeWidgetDelegate* native_widget_delegate,
         views::DesktopNativeWidgetAura* desktop_native_widget_aura,
         BrowserView* browser_view,
         BrowserFrame* browser_frame) {
   return new BrowserDesktopWindowTreeHostWin(native_widget_delegate,
                                              desktop_native_widget_aura,
                                              browser_view,
                                              browser_frame);
 }