Merge 23081 - With the recent NNTP changes, we change the way themes work th...

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 26 matching lines @@
 const char* BrowserThemeProvider::kColorFrameIncognitoInactive =
     "frame_incognito_inactive";
 const char* BrowserThemeProvider::kColorToolbar = "toolbar";
 const char* BrowserThemeProvider::kColorTabText = "tab_text";
 const char* BrowserThemeProvider::kColorBackgroundTabText =
     "tab_background_text";
 const char* BrowserThemeProvider::kColorBookmarkText = "bookmark_text";
 const char* BrowserThemeProvider::kColorNTPBackground = "ntp_background";
 const char* BrowserThemeProvider::kColorNTPText = "ntp_text";
 const char* BrowserThemeProvider::kColorNTPLink = "ntp_link";
+const char* BrowserThemeProvider::kColorNTPHeader = "ntp_header";
 const char* BrowserThemeProvider::kColorNTPSection = "ntp_section";
 const char* BrowserThemeProvider::kColorNTPSectionText = "ntp_section_text";
 const char* BrowserThemeProvider::kColorNTPSectionLink = "ntp_section_link";
 const char* BrowserThemeProvider::kColorControlBackground =
     "control_background";
 const char* BrowserThemeProvider::kColorButtonBackground = "button_background";
 
 // Strings used by themes to identify tints to apply to different parts of
 // our UI. The frame tints apply to the frame color and produce the
 // COLOR_FRAME* colors.
@@ skipping 41 matching lines @@
 const SkColor BrowserThemeProvider::kDefaultColorBackgroundTabText =
     SkColorSetRGB(64, 64, 64);
 const SkColor BrowserThemeProvider::kDefaultColorBookmarkText =
     SkColorSetRGB(18, 50, 114);
 const SkColor BrowserThemeProvider::kDefaultColorNTPBackground =
     SkColorSetRGB(255, 255, 255);
 const SkColor BrowserThemeProvider::kDefaultColorNTPText =
     SkColorSetRGB(0, 0, 0);
 const SkColor BrowserThemeProvider::kDefaultColorNTPLink =
     SkColorSetRGB(0, 0, 0);
+const SkColor BrowserThemeProvider::kDefaultColorNTPHeader =
+    SkColorSetRGB(75, 140, 220);
 const SkColor BrowserThemeProvider::kDefaultColorNTPSection =
-    SkColorSetRGB(75, 140, 220);
+    SkColorSetRGB(229, 239, 254);
 const SkColor BrowserThemeProvider::kDefaultColorNTPSectionText =
-    SkColorSetRGB(255, 255, 255);
+    SkColorSetRGB(0, 0, 0);
 const SkColor BrowserThemeProvider::kDefaultColorNTPSectionLink =
-    SkColorSetRGB(127, 148, 173);
+    SkColorSetRGB(16, 50, 105);
 const SkColor BrowserThemeProvider::kDefaultColorControlBackground = NULL;
 const SkColor BrowserThemeProvider::kDefaultColorButtonBackground = NULL;
 
 // Default tints.
 const skia::HSL BrowserThemeProvider::kDefaultTintButtons = { -1, -1, -1 };
 const skia::HSL BrowserThemeProvider::kDefaultTintFrame = { -1, -1, -1 };
 const skia::HSL BrowserThemeProvider::kDefaultTintFrameInactive =
     { -1, -1, 0.75f };
 const skia::HSL BrowserThemeProvider::kDefaultTintFrameIncognito =
     { -1, 0.2f, 0.35f };
@@ skipping 151 matching lines @@
     case COLOR_BACKGROUND_TAB_TEXT:
       return kColorBackgroundTabText;
     case COLOR_BOOKMARK_TEXT:
       return kColorBookmarkText;
     case COLOR_NTP_BACKGROUND:
       return kColorNTPBackground;
     case COLOR_NTP_TEXT:
       return kColorNTPText;
     case COLOR_NTP_LINK:
       return kColorNTPLink;
+    case COLOR_NTP_HEADER:
+      return kColorNTPHeader;
     case COLOR_NTP_SECTION:
       return kColorNTPSection;
     case COLOR_NTP_SECTION_TEXT:
       return kColorNTPSectionText;
     case COLOR_NTP_SECTION_LINK:
       return kColorNTPSectionLink;
     case COLOR_CONTROL_BACKGROUND:
       return kColorControlBackground;
     case COLOR_BUTTON_BACKGROUND:
       return kColorButtonBackground;
@@ skipping 20 matching lines @@
     case COLOR_BACKGROUND_TAB_TEXT:
       return kDefaultColorBackgroundTabText;
     case COLOR_BOOKMARK_TEXT:
       return kDefaultColorBookmarkText;
     case COLOR_NTP_BACKGROUND:
       return kDefaultColorNTPBackground;
     case COLOR_NTP_TEXT:
       return kDefaultColorNTPText;
     case COLOR_NTP_LINK:
       return kDefaultColorNTPLink;
+    case COLOR_NTP_HEADER:
+      return kDefaultColorNTPHeader;
     case COLOR_NTP_SECTION:
       return kDefaultColorNTPSection;
     case COLOR_NTP_SECTION_TEXT:
       return kDefaultColorNTPSectionText;
     case COLOR_NTP_SECTION_LINK:
       return kDefaultColorNTPSectionLink;
     case COLOR_CONTROL_BACKGROUND:
       return kDefaultColorControlBackground;
     case COLOR_BUTTON_BACKGROUND:
       return kDefaultColorButtonBackground;
     default:
       // Return a debugging red color.
       return 0xffff0000;
   }
 }
 
 SkColor BrowserThemeProvider::GetColor(int id) {
   DCHECK(CalledOnValidThread());
 
+  // Special-case NTP header - if the color isn't provided, we fall back to
+  // the section color.
+  if (id == COLOR_NTP_HEADER) {
+    if (colors_.find(kColorNTPHeader) != colors_.end())
+      return colors_[kColorNTPHeader];
+    else if (colors_.find(kColorNTPSection) != colors_.end())
+      return colors_[kColorNTPSection];
+    return GetDefaultColor(id);
+  }
+
   // TODO(glen): Figure out if we need to tint these. http://crbug.com/11578
   ColorMap::iterator color_iter = colors_.find(GetColorKey(id));
   if (color_iter != colors_.end())
     return color_iter->second;
   else
     return GetDefaultColor(id);
 }
 
 bool BrowserThemeProvider::GetDisplayProperty(int id, int* result) {
   switch (id) {
@@ skipping 65 matching lines @@
   ClearCaches();
 
   DCHECK(extension);
   DCHECK(extension->IsTheme());
   SetImageData(extension->GetThemeImages(),
                extension->path());
   SetColorData(extension->GetThemeColors());
   SetTintData(extension->GetThemeTints());
   SetDisplayPropertyData(extension->GetThemeDisplayProperties());
   raw_data_.clear();
-  GenerateFrameColors();
-  GenerateFrameImages();
-  GenerateTabImages();
 
   SaveImageData(extension->GetThemeImages());
   SaveColorData();
   SaveTintData();
   SaveDisplayPropertyData();
   SaveThemeID(extension->id());
 
+  GenerateFrameColors();
+  GenerateFrameImages();
+  GenerateTabImages();
+
   NotifyThemeChanged();
   UserMetrics::RecordAction(L"Themes_Installed", profile_);
 }
 
 void BrowserThemeProvider::UseDefaultTheme() {
   ClearAllThemeData();
   NotifyThemeChanged();
   UserMetrics::RecordAction(L"Themes_Reset", profile_);
 }
 
@@ skipping 571 matching lines @@
     delete i->second;
   }
   image_cache_.clear();
 }
 
 #if defined(TOOLKIT_VIEWS)
 void BrowserThemeProvider::FreePlatformCaches() {
   // Views (Skia) has no platform image cache to clear.
 }
 #endif