First set of changes for M7 NTP.

chrome/browser/dom_ui/ntp_resource_cache.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/dom_ui/ntp_resource_cache.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "app/animation.h"
@@ skipping 206 matching lines @@
 
   new_tab_incognito_html_ = new RefCountedBytes;
   new_tab_incognito_html_->data.resize(full_html.size());
   std::copy(full_html.begin(), full_html.end(),
             new_tab_incognito_html_->data.begin());
 }
 
 void NTPResourceCache::CreateNewTabHTML() {
   // Show the profile name in the title and most visited labels if the current
   // profile is not the default.
+  string16 apps = l10n_util::GetStringUTF16(IDS_NEW_TAB_APPS);
   string16 title = l10n_util::GetStringUTF16(IDS_NEW_TAB_TITLE);
   string16 most_visited = l10n_util::GetStringUTF16(IDS_NEW_TAB_MOST_VISITED);
   DictionaryValue localized_strings;
   localized_strings.SetString("bookmarkbarattached",
       profile_->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar) ?
       "true" : "false");
   localized_strings.SetString("hasattribution",
       profile_->GetThemeProvider()->HasCustomImage(IDR_THEME_NTP_ATTRIBUTION) ?
       "true" : "false");
+  localized_strings.SetString("apps", apps);
   localized_strings.SetString("title", title);
   localized_strings.SetString("mostvisited", most_visited);
   localized_strings.SetString("restorethumbnails",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_RESTORE_THUMBNAILS_LINK));
   localized_strings.SetString("recentlyclosed",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_RECENTLY_CLOSED));
   localized_strings.SetString("closedwindowsingle",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_RECENTLY_CLOSED_WINDOW_SINGLE));
   localized_strings.SetString("closedwindowmultiple",
       l10n_util::GetStringUTF16(IDS_NEW_TAB_RECENTLY_CLOSED_WINDOW_MULTIPLE));
@@ skipping 143 matching lines @@
       tp->GetColor(BrowserThemeProvider::COLOR_NTP_LINK_UNDERLINE);
 
   SkColor color_section =
       tp->GetColor(BrowserThemeProvider::COLOR_NTP_SECTION);
   SkColor color_section_text =
       tp->GetColor(BrowserThemeProvider::COLOR_NTP_SECTION_TEXT);
   SkColor color_section_link =
       tp->GetColor(BrowserThemeProvider::COLOR_NTP_SECTION_LINK);
   SkColor color_section_link_underline =
       tp->GetColor(BrowserThemeProvider::COLOR_NTP_SECTION_LINK_UNDERLINE);
+  SkColor color_section_header_text =
+      tp->GetColor(BrowserThemeProvider::COLOR_NTP_SECTION_HEADER_TEXT);
+  SkColor color_section_header_text_hover =
+      tp->GetColor(BrowserThemeProvider::COLOR_NTP_SECTION_HEADER_TEXT_HOVER);
 
   SkColor color_header =
       tp->GetColor(BrowserThemeProvider::COLOR_NTP_HEADER);
   // Generate a lighter color for the header gradients.
   color_utils::HSL header_lighter;
   color_utils::SkColorToHSL(color_header, &header_lighter);
   header_lighter.l += (1 - header_lighter.l) * 0.33;
   SkColor color_header_gradient_light =
       color_utils::HSLToSkColor(header_lighter, SkColorGetA(color_header));
 
@@ skipping 27 matching lines @@
   subst.push_back(SkColorToRGBAString(color_link));  // $9
 
   subst2.push_back(SkColorToRGBAString(color_section));  // $$1
   subst2.push_back(SkColorToRGBAString(color_section_border));  // $$2
   subst2.push_back(SkColorToRGBAString(color_section_text));  // $$3
   subst2.push_back(SkColorToRGBAString(color_section_link));  // $$4
   subst2.push_back(
       tp->HasCustomImage(IDR_THEME_NTP_ATTRIBUTION) ? "block" : "none");  // $$5
   subst2.push_back(SkColorToRGBAString(color_link_underline));  // $$6
   subst2.push_back(SkColorToRGBAString(color_section_link_underline));  // $$7
+  subst2.push_back(SkColorToRGBAString(color_section_header_text)); // $$8
+  subst2.push_back(SkColorToRGBAString(
+      color_section_header_text_hover)); // $$9
 
   // Get our template.
   static const base::StringPiece new_tab_theme_css(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
       IDR_NEW_TAB_THEME_CSS));
 
   // Create the string from our template and the replacements.
-  const std::string css_string = ReplaceStringPlaceholders(
-      new_tab_theme_css, subst, NULL);
-  std::string full_css = ReplaceStringPlaceholders(css_string, subst2, NULL);
+  std::string css_string;
+  css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL);
+  css_string = ReplaceStringPlaceholders(css_string, subst2, NULL);
 
   new_tab_css_ = new RefCountedBytes;
-  new_tab_css_->data.resize(full_css.size());
-  std::copy(full_css.begin(), full_css.end(),
+  new_tab_css_->data.resize(css_string.size());
+  std::copy(css_string.begin(), css_string.end(),
             new_tab_css_->data.begin());
 }