Reland: Replace CONTROL_BACKGROUND and DETACHED_BOOKMARK_BAR_BACKGROUND by COLOR_NTP_BACKGROUND

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

 // Copyright 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 488 matching lines @@
   new_tab_html_ = base::RefCountedString::TakeString(&full_html);
 }
 
 void NTPResourceCache::CreateNewTabIncognitoCSS() {
   // TODO(estade): this returns a subtly incorrect theme provider because
   // |profile_| is actually not the incognito profile. See crbug.com/568388
   const ui::ThemeProvider& tp =
       ThemeService::GetThemeProviderForProfile(profile_);
 
   // Get our theme colors
-  SkColor color_background =
-      tp.HasCustomImage(IDR_THEME_NTP_BACKGROUND)
-          ? GetThemeColor(tp, ThemeProperties::COLOR_NTP_BACKGROUND)
-          : SkColorSetRGB(0x32, 0x32, 0x32);
+  SkColor color_background = ThemeProperties::GetDefaultColor(
+      ThemeProperties::COLOR_NTP_BACKGROUND,
+      !tp.HasCustomImage(IDR_THEME_NTP_BACKGROUND));

[Peter Kasting, 2016/08/18 09:12:36]

This seems like a behavior change -- before, if the theme had a custom NTP
background image, we used the theme's NTP background color, modulated by the
inversion code in GetThemeColor().  (This seems weird, BTW.  Do we display the
theme's NTP for incognito NTPs if the theme has a custom background, but display
the normal placeholder otherwise?)

Now, you use the default NTP background colors in either case, ignoring the
theme ones and the inversion code in GetThemeColor(), you just toggle between
normal and incognito color sets based on if the theme has a custom image.  If
the old behavior was strange, this seems even stranger.

 
   // Generate the replacements.
   ui::TemplateReplacements substitutions;
 
   // Cache-buster for background.
   substitutions["themeId"] =
       profile_->GetPrefs()->GetString(prefs::kCurrentThemeID);
 
   // Colors.
   substitutions["colorBackground"] = SkColorToRGBAString(color_background);
@@ skipping 80 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);
 }