[MD] Change appearance of incognito NTP to MD spec.

chrome/browser/ui/webui/ntp/ntp_resource_cache.cc

 // Copyright (c) 2012 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/ui/webui/ntp/ntp_resource_cache.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 224 matching lines @@
       return NTPResourceCache::INCOGNITO;
   } else if (profile->IsOffTheRecord()) {
     return NTPResourceCache::INCOGNITO;
   }
   return NTPResourceCache::NORMAL;
 }
 
 base::RefCountedMemory* NTPResourceCache::GetNewTabHTML(WindowType win_type) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (win_type == GUEST) {
-    if (!new_tab_guest_html_.get())
+    if (!new_tab_guest_html_)
       CreateNewTabGuestHTML();
     return new_tab_guest_html_.get();
   } else if (win_type == INCOGNITO) {
-    if (!new_tab_incognito_html_.get())
+    if (!new_tab_incognito_html_)
       CreateNewTabIncognitoHTML();
     return new_tab_incognito_html_.get();
   } else {
     // Refresh the cached HTML if necessary.
     // NOTE: NewTabCacheNeedsRefresh() must be called every time the new tab
     // HTML is fetched, because it needs to initialize cached values.
-    if (NewTabCacheNeedsRefresh() || !new_tab_html_.get())
+    if (NewTabCacheNeedsRefresh() || !new_tab_html_)
       CreateNewTabHTML();
     return new_tab_html_.get();
   }
 }
 
 base::RefCountedMemory* NTPResourceCache::GetNewTabCSS(WindowType win_type) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  if (win_type == GUEST) {
-    if (!new_tab_guest_css_.get())
-      CreateNewTabGuestCSS();
-    return new_tab_guest_css_.get();
-  } else if (win_type == INCOGNITO) {
-    if (!new_tab_incognito_css_.get())
+  DCHECK_NE(win_type, GUEST);
+
+  if (win_type == INCOGNITO) {
+    if (!new_tab_incognito_css_.)

[Dan Beam, 2015/11/20 00:48:45]

oops

[Evan Stade, 2015/11/20 22:05:17]

Done.

       CreateNewTabIncognitoCSS();
     return new_tab_incognito_css_.get();
-  } else {
-    if (!new_tab_css_.get())
-      CreateNewTabCSS();
-    return new_tab_css_.get();
   }
+
+  if (!new_tab_css_)
+    CreateNewTabCSS();
+  return new_tab_css_.get();
 }
 
 void NTPResourceCache::Observe(int type,
                                const content::NotificationSource& source,
                                const content::NotificationDetails& details) {
   // Invalidate the cache.
   if (chrome::NOTIFICATION_BROWSER_THEME_CHANGED == type ||
       chrome::NOTIFICATION_PROMO_RESOURCE_STATE_CHANGED == type) {
     Invalidate();
   } else {
@@ skipping 43 matching lines @@
   }
 
   localized_strings.SetString("learnMore",
       l10n_util::GetStringUTF16(new_tab_link_ids));
   localized_strings.SetString("learnMoreLink", new_tab_link);
 
   bool bookmark_bar_attached =
       profile_->GetPrefs()->GetBoolean(bookmarks::prefs::kShowBookmarkBar);
   localized_strings.SetBoolean("bookmarkbarattached", bookmark_bar_attached);
 
+  ui::ThemeProvider* tp = ThemeServiceFactory::GetForProfile(profile_);
+  localized_strings.SetBoolean("hasCustomBackground",
+                               tp->HasCustomImage(IDR_THEME_NTP_BACKGROUND));
+
   const std::string& app_locale = g_browser_process->GetApplicationLocale();
   webui::SetLoadTimeDataDefaults(app_locale, &localized_strings);
 
   static const base::StringPiece incognito_tab_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           new_tab_html_idr));
 
   std::string full_html = webui::GetI18nTemplateHtml(
       incognito_tab_html, &localized_strings);
 
@@ skipping 182 matching lines @@
       webui::GetI18nTemplateHtml(new_tab_html, &load_time_data);
   new_tab_html_ = base::RefCountedString::TakeString(&full_html);
 }
 
 void NTPResourceCache::CreateNewTabIncognitoCSS() {
   ui::ThemeProvider* tp = ThemeServiceFactory::GetForProfile(profile_);
   DCHECK(tp);
 
   // Get our theme colors
   SkColor color_background =
-      GetThemeColor(tp, ThemeProperties::COLOR_NTP_BACKGROUND);
+      tp->HasCustomImage(IDR_THEME_NTP_BACKGROUND)
+          ? GetThemeColor(tp, ThemeProperties::COLOR_NTP_BACKGROUND)
+          : SkColorSetRGB(0x32, 0x32, 0x32);
 
   // Generate the replacements.
   std::map<base::StringPiece, std::string> substitutions;
 
   // Cache-buster for background.
   substitutions["themeId"] =
       profile_->GetPrefs()->GetString(prefs::kCurrentThemeID);
 
   // Colors.
   substitutions["colorBackground"] = SkColorToRGBAString(color_background);
   substitutions["backgroundBarDetached"] = GetNewTabBackgroundCSS(tp, false);
   substitutions["backgroundBarAttached"] = GetNewTabBackgroundCSS(tp, true);
   substitutions["backgroundTiling"] = GetNewTabBackgroundTilingCSS(tp);
 
   // Get our template.
   static const base::StringPiece new_tab_theme_css(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_NEW_INCOGNITO_TAB_THEME_CSS));
 
   // Create the string from our template and the replacements.
   std::string full_css =
       ui::ReplaceTemplateExpressions(new_tab_theme_css, substitutions);
 
   new_tab_incognito_css_ = base::RefCountedString::TakeString(&full_css);
 }
 
-void NTPResourceCache::CreateNewTabGuestCSS() {
-  ui::ThemeProvider* tp = ThemeServiceFactory::GetForProfile(profile_);
-  DCHECK(tp);
-
-  // Get our theme colors
-  SkColor color_background =
-      GetThemeColor(tp, ThemeProperties::COLOR_NTP_BACKGROUND);
-
-  // Generate the replacements.
-  std::map<base::StringPiece, std::string> substitutions;
-
-  // Cache-buster for background.
-  substitutions["themeId"] =
-      profile_->GetPrefs()->GetString(prefs::kCurrentThemeID);
-
-  // Colors.
-  substitutions["colorBackground"] = SkColorToRGBAString(color_background);
-  substitutions["backgroundBarDetached"] = GetNewTabBackgroundCSS(tp, false);
-  substitutions["backgroundBarAttached"] = GetNewTabBackgroundCSS(tp, true);
-  substitutions["backgroundTiling"] = GetNewTabBackgroundTilingCSS(tp);
-
-  // Get our template.
-  static const base::StringPiece new_tab_theme_css(
-      ResourceBundle::GetSharedInstance().GetRawDataResource(
-          IDR_NEW_INCOGNITO_TAB_THEME_CSS));
-
-  // Create the string from our template and the replacements.
-  std::string full_css =
-      ui::ReplaceTemplateExpressions(new_tab_theme_css, substitutions);
-
-  new_tab_guest_css_ = base::RefCountedString::TakeString(&full_css);
-}
-
 void NTPResourceCache::CreateNewTabCSS() {
   ui::ThemeProvider* tp = ThemeServiceFactory::GetForProfile(profile_);
   DCHECK(tp);
 
   // Get our theme colors
   SkColor color_background =
       GetThemeColor(tp, ThemeProperties::COLOR_NTP_BACKGROUND);
   SkColor color_text = GetThemeColor(tp, ThemeProperties::COLOR_NTP_TEXT);
   SkColor color_text_light =
       GetThemeColor(tp, ThemeProperties::COLOR_NTP_TEXT_LIGHT);
@@ skipping 54 matching lines @@
   // Get our template.
   static const base::StringPiece new_tab_theme_css(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_NEW_TAB_4_THEME_CSS));
 
   // Create the string from our template and the replacements.
   std::string css_string =
       ui::ReplaceTemplateExpressions(new_tab_theme_css, substitutions);
   new_tab_css_ = base::RefCountedString::TakeString(&css_string);
 }