Rejigger ThemeService: move exposure of ThemeProvider interface to a

chrome/browser/search/instant_service.cc

 // Copyright 2013 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/search/instant_service.h"
 
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 218 matching lines @@
     suggestions_service_->ClearBlacklist(
         base::Bind(&InstantService::OnSuggestionsAvailable,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 }
 
 void InstantService::UpdateThemeInfo() {
 #if defined(ENABLE_THEMES)
   // Update theme background info.
   // Initialize |theme_info| if necessary.
-  if (!theme_info_)
-    OnThemeChanged(ThemeServiceFactory::GetForProfile(profile_));
-  else
-    OnThemeChanged(NULL);
+  if (!theme_info_) {
+    OnThemeChanged();
+  } else {
+    FOR_EACH_OBSERVER(InstantServiceObserver, observers_,
+                      ThemeInfoChanged(*theme_info_));
+  }
 #endif  // defined(ENABLE_THEMES)
 }
 
 void InstantService::UpdateMostVisitedItemsInfo() {
   NotifyAboutMostVisitedItems();
 }
 
 void InstantService::Shutdown() {
   process_ids_.clear();
 
@@ skipping 18 matching lines @@
   switch (type) {
     case content::NOTIFICATION_RENDERER_PROCESS_CREATED:
       SendSearchURLsToRenderer(
           content::Source<content::RenderProcessHost>(source).ptr());
       break;
     case content::NOTIFICATION_RENDERER_PROCESS_TERMINATED:
       OnRendererProcessTerminated(
           content::Source<content::RenderProcessHost>(source)->GetID());
       break;
 #if defined(ENABLE_THEMES)
-    case chrome::NOTIFICATION_BROWSER_THEME_CHANGED: {
-      OnThemeChanged(content::Source<ThemeService>(source).ptr());
+    case chrome::NOTIFICATION_BROWSER_THEME_CHANGED:
+      OnThemeChanged();
       break;
-    }
 #endif  // defined(ENABLE_THEMES)
     default:
       NOTREACHED() << "Unexpected notification type in InstantService.";
   }
 }
 
 void InstantService::SendSearchURLsToRenderer(content::RenderProcessHost* rph) {
   rph->Send(new ChromeViewMsg_SetSearchURLs(
       search::GetSearchURLs(profile_), search::GetNewTabPageURL(profile_)));
 }
@@ skipping 81 matching lines @@
   RGBAColor color;
   color.r = SkColorGetR(sKColor);
   color.g = SkColorGetG(sKColor);
   color.b = SkColorGetB(sKColor);
   color.a = SkColorGetA(sKColor);
   return color;
 }
 
 }  // namespace
 
-void InstantService::OnThemeChanged(ThemeService* theme_service) {
-  if (!theme_service) {
-    DCHECK(theme_info_.get());
-    FOR_EACH_OBSERVER(InstantServiceObserver, observers_,
-                      ThemeInfoChanged(*theme_info_));
-    return;
-  }
-
+void InstantService::OnThemeChanged() {
   // Get theme information from theme service.
   theme_info_.reset(new ThemeBackgroundInfo());
 
   // Get if the current theme is the default theme.
+  ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile_);
   theme_info_->using_default_theme = theme_service->UsingDefaultTheme();
 
   // Get theme colors.
+  const ui::ThemeProvider& theme_provider =
+      ThemeService::GetThemeProviderForProfile(profile_);
   SkColor background_color =
-      theme_service->GetColor(ThemeProperties::COLOR_NTP_BACKGROUND);
-  SkColor text_color =
-      theme_service->GetColor(ThemeProperties::COLOR_NTP_TEXT);
-  SkColor link_color =
-      theme_service->GetColor(ThemeProperties::COLOR_NTP_LINK);
+      theme_provider.GetColor(ThemeProperties::COLOR_NTP_BACKGROUND);
+  SkColor text_color = theme_provider.GetColor(ThemeProperties::COLOR_NTP_TEXT);
+  SkColor link_color = theme_provider.GetColor(ThemeProperties::COLOR_NTP_LINK);
   SkColor text_color_light =
-      theme_service->GetColor(ThemeProperties::COLOR_NTP_TEXT_LIGHT);
+      theme_provider.GetColor(ThemeProperties::COLOR_NTP_TEXT_LIGHT);
   SkColor header_color =
-      theme_service->GetColor(ThemeProperties::COLOR_NTP_HEADER);
+      theme_provider.GetColor(ThemeProperties::COLOR_NTP_HEADER);
   // Generate section border color from the header color.
   SkColor section_border_color =
       SkColorSetARGB(kSectionBorderAlphaTransparency,
                      SkColorGetR(header_color),
                      SkColorGetG(header_color),
                      SkColorGetB(header_color));
 
   // Invert colors if needed.
   if (color_utils::IsInvertedColorScheme()) {
     background_color = color_utils::InvertColor(background_color);
     text_color = color_utils::InvertColor(text_color);
     link_color = color_utils::InvertColor(link_color);
     text_color_light = color_utils::InvertColor(text_color_light);
     header_color = color_utils::InvertColor(header_color);
     section_border_color = color_utils::InvertColor(section_border_color);
   }
 
   // Set colors.
   theme_info_->background_color = SkColorToRGBAColor(background_color);
   theme_info_->text_color = SkColorToRGBAColor(text_color);
   theme_info_->link_color = SkColorToRGBAColor(link_color);
   theme_info_->text_color_light = SkColorToRGBAColor(text_color_light);
   theme_info_->header_color = SkColorToRGBAColor(header_color);
   theme_info_->section_border_color = SkColorToRGBAColor(section_border_color);
 
-  int logo_alternate = theme_service->GetDisplayProperty(
-      ThemeProperties::NTP_LOGO_ALTERNATE);
+  int logo_alternate =
+      theme_provider.GetDisplayProperty(ThemeProperties::NTP_LOGO_ALTERNATE);
   theme_info_->logo_alternate = logo_alternate == 1;
 
-  if (theme_service->HasCustomImage(IDR_THEME_NTP_BACKGROUND)) {
+  if (theme_provider.HasCustomImage(IDR_THEME_NTP_BACKGROUND)) {
     // Set theme id for theme background image url.
     theme_info_->theme_id = theme_service->GetThemeID();
 
     // Set theme background image horizontal alignment.
-    int alignment = theme_service->GetDisplayProperty(
+    int alignment = theme_provider.GetDisplayProperty(
         ThemeProperties::NTP_BACKGROUND_ALIGNMENT);
     if (alignment & ThemeProperties::ALIGN_LEFT)
       theme_info_->image_horizontal_alignment = THEME_BKGRND_IMAGE_ALIGN_LEFT;
     else if (alignment & ThemeProperties::ALIGN_RIGHT)
       theme_info_->image_horizontal_alignment = THEME_BKGRND_IMAGE_ALIGN_RIGHT;
     else
       theme_info_->image_horizontal_alignment = THEME_BKGRND_IMAGE_ALIGN_CENTER;
 
     // Set theme background image vertical alignment.
     if (alignment & ThemeProperties::ALIGN_TOP)
       theme_info_->image_vertical_alignment = THEME_BKGRND_IMAGE_ALIGN_TOP;
     else if (alignment & ThemeProperties::ALIGN_BOTTOM)
       theme_info_->image_vertical_alignment = THEME_BKGRND_IMAGE_ALIGN_BOTTOM;
     else
       theme_info_->image_vertical_alignment = THEME_BKGRND_IMAGE_ALIGN_CENTER;
 
     // Set theme backgorund image tiling.
-    int tiling = theme_service->GetDisplayProperty(
+    int tiling = theme_provider.GetDisplayProperty(
         ThemeProperties::NTP_BACKGROUND_TILING);
     switch (tiling) {
       case ThemeProperties::NO_REPEAT:
         theme_info_->image_tiling = THEME_BKGRND_IMAGE_NO_REPEAT;
         break;
       case ThemeProperties::REPEAT_X:
         theme_info_->image_tiling = THEME_BKGRND_IMAGE_REPEAT_X;
         break;
       case ThemeProperties::REPEAT_Y:
         theme_info_->image_tiling = THEME_BKGRND_IMAGE_REPEAT_Y;
         break;
       case ThemeProperties::REPEAT:
         theme_info_->image_tiling = THEME_BKGRND_IMAGE_REPEAT;
         break;
     }
 
     // Set theme background image height.
-    gfx::ImageSkia* image = theme_service->GetImageSkiaNamed(
-        IDR_THEME_NTP_BACKGROUND);
+    gfx::ImageSkia* image =
+        theme_provider.GetImageSkiaNamed(IDR_THEME_NTP_BACKGROUND);
     DCHECK(image);
     theme_info_->image_height = image->height();
 
     theme_info_->has_attribution =
-       theme_service->HasCustomImage(IDR_THEME_NTP_ATTRIBUTION);
+        theme_provider.HasCustomImage(IDR_THEME_NTP_ATTRIBUTION);
   }
 
   FOR_EACH_OBSERVER(InstantServiceObserver, observers_,
                     ThemeInfoChanged(*theme_info_));
 }
 #endif  // defined(ENABLE_THEMES)
 
 void InstantService::OnTemplateURLServiceChanged() {
   // Check whether the default search provider was changed.
   const TemplateURL* template_url =
@@ skipping 42 matching lines @@
 }
 
 void InstantService::ResetInstantSearchPrerenderer() {
   if (!search::ShouldPrefetchSearchResults())
     return;
 
   GURL url(search::GetSearchResultPrefetchBaseURL(profile_));
   instant_prerenderer_.reset(
       url.is_valid() ? new InstantSearchPrerenderer(profile_, url) : NULL);
 }