First set of changes for M7 NTP.

chrome/browser/browser_theme_provider.cc

 // Copyright (c) 2010 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 "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_theme_pack.h"
@@ skipping 61 matching lines @@
 #else
 // TODO(beng): source from theme provider.
 const SkColor kDefaultColorNTPBackground = SK_ColorWHITE;
 const SkColor kDefaultColorNTPText = SK_ColorBLACK;
 const SkColor kDefaultColorNTPLink = SkColorSetRGB(6, 55, 116);
 #endif
 const SkColor kDefaultColorNTPHeader = SkColorSetRGB(75, 140, 220);
 const SkColor kDefaultColorNTPSection = SkColorSetRGB(229, 239, 254);
 const SkColor kDefaultColorNTPSectionText = SK_ColorBLACK;
 const SkColor kDefaultColorNTPSectionLink = SkColorSetRGB(6, 55, 116);
+const SkColor kDefaultColorNTPSectionHeaderText = SkColorSetRGB(76, 76, 76);
 const SkColor kDefaultColorControlBackground = SkColorSetARGB(0, 0, 0, 0);
 const SkColor kDefaultColorButtonBackground = SkColorSetARGB(0, 0, 0, 0);
 #if defined(OS_MACOSX)
 const SkColor kDefaultColorToolbarButtonStroke = SkColorSetARGB(75, 81, 81, 81);
 const SkColor kDefaultColorToolbarButtonStrokeInactive =
     SkColorSetARGB(75, 99, 99, 99);
 const SkColor kDefaultColorToolbarBezel = SkColorSetRGB(247, 247, 247);
 const SkColor kDefaultColorToolbarStroke = SkColorSetRGB(103, 103, 103);
 const SkColor kDefaultColorToolbarStrokeInactive = SkColorSetRGB(123, 123, 123);
 #endif
@@ skipping 345 matching lines @@
     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_NTP_SECTION_LINK_UNDERLINE:
       return TintForUnderline(kDefaultColorNTPSectionLink);
+    case COLOR_NTP_SECTION_HEADER_TEXT:
+      return kDefaultColorNTPSectionHeaderText;
+    case COLOR_NTP_SECTION_HEADER_TEXT_HOVER:
+      return kDefaultColorNTPText;
     case COLOR_CONTROL_BACKGROUND:
       return kDefaultColorControlBackground;
     case COLOR_BUTTON_BACKGROUND:
       return kDefaultColorButtonBackground;
 #if defined(OS_MACOSX)
     case COLOR_TOOLBAR_BUTTON_STROKE:
       return kDefaultColorToolbarButtonStroke;
     case COLOR_TOOLBAR_BUTTON_STROKE_INACTIVE:
       return kDefaultColorToolbarButtonStrokeInactive;
     case COLOR_TOOLBAR_BEZEL:
@@ skipping 143 matching lines @@
 void BrowserThemeProvider::OnInfobarDisplayed() {
   number_of_infobars_++;
 }
 
 void BrowserThemeProvider::OnInfobarDestroyed() {
   number_of_infobars_--;
 
   if (number_of_infobars_ == 0)
     RemoveUnusedThemes();
 }