Rejigger ThemeService: move exposure of ThemeProvider interface to a

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright 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_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 20 matching lines @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_window.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/signin/chrome_signin_helper.h"
 #include "chrome/browser/themes/theme_properties.h"
-#include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
@@ skipping 151 matching lines @@
   int y = at_top ? 0 : (view->height() - thickness);
   canvas->FillRect(gfx::Rect(0, y, view->width(), thickness), color);
 }
 
 // TODO(kuan): These functions are temporarily for the bookmark bar while its
 // detached state is at the top of the page;  it'll be moved to float on the
 // content page in the very near future, at which time, these local functions
 // will be removed.
 void PaintDetachedBookmarkBar(gfx::Canvas* canvas,
                               BookmarkBarView* view,
-                              ThemeService* theme_service) {
+                              Profile* profile) {
   // Paint background for detached state; if animating, this is fade in/out.
-  canvas->DrawColor(
-      chrome::GetDetachedBookmarkBarBackgroundColor(theme_service));
+  canvas->DrawColor(chrome::GetDetachedBookmarkBarBackgroundColor(profile));
   // Draw the separators above and below bookmark bar;
   // if animating, these are fading in/out.
   SkColor separator_color =
-      chrome::GetDetachedBookmarkBarSeparatorColor(theme_service);
+      chrome::GetDetachedBookmarkBarSeparatorColor(profile);
 
   if (ui::MaterialDesignController::IsModeMaterial()) {
     BrowserView::Paint1pxHorizontalLine(
         canvas, separator_color,
         gfx::Rect(0, 0, view->width(),
                   views::NonClientFrameView::kClientEdgeThickness),
         true);
   } else {
     PaintHorizontalBorder(canvas, view, true, separator_color);
   }
@@ skipping 179 matching lines @@
                              browser_view_,
                              browser_->host_desktop_type(),
                              toolbar_overlap);
     return;
   }
 
   // As 'hidden' according to the animation is the full in-tab state, we invert
   // the value - when current_state is at '0', we expect the bar to be docked.
   double current_state = 1 - bookmark_bar_view_->GetAnimationValue();
 
-  ThemeService* ts = ThemeServiceFactory::GetForProfile(browser_->profile());
   if (current_state == 0.0 || current_state == 1.0) {
-    PaintDetachedBookmarkBar(canvas, bookmark_bar_view_, ts);
+    PaintDetachedBookmarkBar(canvas, bookmark_bar_view_, browser_->profile());
     return;
   }
   // While animating, set opacity to cross-fade between attached and detached
   // backgrounds including their respective separators.
   int detached_alpha = static_cast<uint8>(current_state * 255);
   int attached_alpha = 255 - detached_alpha;
   if (browser_->bookmark_bar_state() == BookmarkBar::DETACHED) {
     // To animate from attached to detached state:
     // - fade out attached background
     // - fade in detached background.
     canvas->SaveLayerAlpha(attached_alpha);
     PaintAttachedBookmarkBar(canvas,
                              bookmark_bar_view_,
                              browser_view_,
                              browser_->host_desktop_type(),
                              toolbar_overlap);
     canvas->Restore();
     canvas->SaveLayerAlpha(detached_alpha);
-    PaintDetachedBookmarkBar(canvas, bookmark_bar_view_, ts);
+    PaintDetachedBookmarkBar(canvas, bookmark_bar_view_, browser_->profile());
   } else {
     // To animate from detached to attached state:
     // - fade out detached background
     // - fade in attached background.
     canvas->SaveLayerAlpha(detached_alpha);
-    PaintDetachedBookmarkBar(canvas, bookmark_bar_view_, ts);
+    PaintDetachedBookmarkBar(canvas, bookmark_bar_view_, browser_->profile());
     canvas->Restore();
     canvas->SaveLayerAlpha(attached_alpha);
     PaintAttachedBookmarkBar(canvas,
                              bookmark_bar_view_,
                              browser_view_,
                              browser_->host_desktop_type(),
                              toolbar_overlap);
   }
   canvas->Restore();
 }
@@ skipping 2239 matching lines @@
   return immersive_mode_controller()->IsEnabled();
 }
 
 views::Widget* BrowserView::GetBubbleAssociatedWidget() {
   return GetWidget();
 }
 
 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() {
   return top_container_->GetBoundsInScreen();
 }