Allow getting the theme tint as a value so that it can be applied independent...

chrome/browser/browser_theme_provider.cc

 // Copyright (c) 2009 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/browser_theme_provider.h"
 
 #include "base/gfx/png_decoder.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_list.h"
@@ skipping 119 matching lines @@
     }
     frame_tints_[IDR_THEME_FRAME] = TINT_FRAME;
     frame_tints_[IDR_THEME_FRAME_INACTIVE] = TINT_FRAME_INACTIVE;
     frame_tints_[IDR_THEME_FRAME_INCOGNITO] = TINT_FRAME_INCOGNITO;
     frame_tints_[IDR_THEME_FRAME_INCOGNITO_INACTIVE] =
         TINT_FRAME_INCOGNITO_INACTIVE;
   }
 }
 
 BrowserThemeProvider::~BrowserThemeProvider() {
-  FreeImages();
+  ClearCaches();
 }
 
 void BrowserThemeProvider::Init(Profile* profile) {
   DCHECK(CalledOnValidThread());
   profile_ = profile;
   LoadThemePrefs();
 }
 
 SkBitmap* BrowserThemeProvider::GetBitmapNamed(int id) {
   DCHECK(CalledOnValidThread());
@@ skipping 108 matching lines @@
   return false;
 #endif
 }
 
 bool BrowserThemeProvider::HasCustomImage(int id) {
   return (images_.find(id) != images_.end());
 }
 
 void BrowserThemeProvider::SetTheme(Extension* extension) {
   // Clear our image cache.
-  FreeImages();
+  ClearCaches();
 
   DCHECK(extension);
   DCHECK(extension->IsTheme());
   SetImageData(extension->GetThemeImages(),
                extension->path());
   SetColorData(extension->GetThemeColors());
   SetTintData(extension->GetThemeTints());
   SetDisplayPropertyData(extension->GetThemeDisplayProperties());
   GenerateFrameColors();
   GenerateFrameImages();
 
   SaveImageData(extension->GetThemeImages());
   SaveColorData();
   SaveTintData();
   SaveDisplayPropertyData();
 
   NotifyThemeChanged();
   UserMetrics::RecordAction(L"Themes_Installed", profile_);
 }
 
 void BrowserThemeProvider::UseDefaultTheme() {
   // Clear our image cache.
-  FreeImages();
+  ClearCaches();
 
   images_.clear();
   colors_.clear();
   tints_.clear();
   display_properties_.clear();
 
   SaveImageData(NULL);
   SaveColorData();
   SaveTintData();
   SaveDisplayPropertyData();
@@ skipping 51 matching lines @@
                                                     image_width,
                                                     image_height);
   } else {
     // TODO(glen): File no-longer exists, we're out of date. We should
     // clear the theme (or maybe just the pref that points to this
     // image).
     return NULL;
   }
 }
 
+const std::string BrowserThemeProvider::GetTintKey(int id) {
+  switch (id) {
+    case TINT_FRAME:
+      return kTintFrame;
+    case TINT_FRAME_INACTIVE:
+      return kTintFrameInactive;
+    case TINT_FRAME_INCOGNITO:
+      return kTintFrameIncognito;
+    case TINT_FRAME_INCOGNITO_INACTIVE:
+      return kTintFrameIncognitoInactive;
+    case TINT_BUTTONS:
+      return kTintButtons;
+    case TINT_BACKGROUND_TAB:
+      return kTintBackgroundTab;
+    default:
+      NOTREACHED() << "Unknown tint requested";
+      return "";
+  }
+}
+
+skia::HSL BrowserThemeProvider::GetDefaultTint(int id) {
+  switch (id) {
+    case TINT_FRAME:
+      return kDefaultTintFrame;
+    case TINT_FRAME_INACTIVE:
+      return kDefaultTintFrameInactive;
+    case TINT_FRAME_INCOGNITO:
+      return kDefaultTintFrameIncognito;
+    case TINT_FRAME_INCOGNITO_INACTIVE:
+      return kDefaultTintFrameIncognitoInactive;
+    case TINT_BUTTONS:
+      return kDefaultTintButtons;
+    case TINT_BACKGROUND_TAB:
+      return kDefaultTintBackgroundTab;
+    default:
+      skia::HSL result = {-1, -1, -1};
+      return result;
+  }
+}
+
 skia::HSL BrowserThemeProvider::GetTint(int id) {
   DCHECK(CalledOnValidThread());
-  switch (id) {
-    case TINT_FRAME:
-      return (tints_.find(kTintFrame) != tints_.end()) ?
-          tints_[kTintFrame] : kDefaultTintFrame;
-    case TINT_FRAME_INACTIVE:
-      return (tints_.find(kTintFrameInactive) != tints_.end()) ?
-          tints_[kTintFrameInactive] : kDefaultTintFrameInactive;
-    case TINT_FRAME_INCOGNITO:
-      return (tints_.count(kTintFrameIncognito)) ?
-          tints_[kTintFrameIncognito] : kDefaultTintFrameIncognito;
-    case TINT_FRAME_INCOGNITO_INACTIVE:
-      return (tints_.count(kTintFrameIncognitoInactive)) ?
-          tints_[kTintFrameIncognitoInactive] :
-          kDefaultTintFrameIncognitoInactive;
-    case TINT_BUTTONS:
-      return (tints_.find(kTintButtons) != tints_.end()) ?
-          tints_[kTintButtons] :
-          kDefaultTintButtons;
-    case TINT_BACKGROUND_TAB:
-      return (tints_.find(kTintBackgroundTab) != tints_.end()) ?
-          tints_[kTintBackgroundTab] :
-          kDefaultTintBackgroundTab;
-    default:
-      NOTREACHED() << "Unknown tint requested";
-  }
-  skia::HSL result = {-1, -1, -1};
-  return result;
+
+  TintMap::iterator tint_iter = tints_.find(GetTintKey(id));
+  if (tint_iter != tints_.end())
+    return tint_iter->second;
+  else
+    return GetDefaultTint(id);
 }
 
 SkBitmap BrowserThemeProvider::TintBitmap(const SkBitmap& bitmap, int hsl_id) {
   return skia::ImageOperations::CreateHSLShiftedBitmap(bitmap, GetTint(hsl_id));
 }
 
 void BrowserThemeProvider::SetImageData(DictionaryValue* images_value,
                                         FilePath images_path) {
   images_.clear();
 
@@ skipping 320 matching lines @@
     GenerateFrameImages();
     UserMetrics::RecordAction(L"Themes_loaded", profile_);
   }
 }
 
 SkColor BrowserThemeProvider::FindColor(const char* id,
                                         SkColor default_color) {
   return (colors_.find(id) != colors_.end()) ? colors_[id] : default_color;
 }
 
-void BrowserThemeProvider::FreeImages() {
-  FreePlatformImages();
+void BrowserThemeProvider::ClearCaches() {
+  FreePlatformCaches();
   for (ImageCache::iterator i = image_cache_.begin();
        i != image_cache_.end(); i++) {
     delete i->second;
   }
   image_cache_.clear();
 }
 
 #if defined(OS_WIN)
-void BrowserThemeProvider::FreePlatformImages() {
+void BrowserThemeProvider::FreePlatformCaches() {
   // Windows has no platform image cache to clear.
 }
 #endif