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

chrome/browser/browser_theme_provider.cc

Index: chrome/browser/browser_theme_provider.cc
===================================================================
--- chrome/browser/browser_theme_provider.cc	(revision 23165)
+++ chrome/browser/browser_theme_provider.cc	(working copy)
@@ -44,6 +44,7 @@
 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";
@@ -105,12 +106,14 @@
     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;
 
@@ -282,6 +285,8 @@
       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:
@@ -322,6 +327,8 @@
       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:
@@ -341,6 +348,16 @@
 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())
@@ -426,9 +443,6 @@
   SetTintData(extension->GetThemeTints());
   SetDisplayPropertyData(extension->GetThemeDisplayProperties());
   raw_data_.clear();
-  GenerateFrameColors();
-  GenerateFrameImages();
-  GenerateTabImages();
 
   SaveImageData(extension->GetThemeImages());
   SaveColorData();
@@ -436,6 +450,10 @@
   SaveDisplayPropertyData();
   SaveThemeID(extension->id());
 
+  GenerateFrameColors();
+  GenerateFrameImages();
+  GenerateTabImages();
+
   NotifyThemeChanged();
   UserMetrics::RecordAction(L"Themes_Installed", profile_);
 }
Property changes on: chrome\browser\browser_theme_provider.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/browser_theme_provider.cc:r23081