Adds more metadata to the about:webapks page

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 12 matching lines @@
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/app_list/app_list_util.h"
 #include "chrome/browser/ui/apps/app_info_dialog.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h"
 #include "chrome/browser/ui/sync/sync_promo_ui.h"
 #include "chrome/browser/ui/webui/app_launcher_login_handler.h"
+#include "chrome/browser/ui/webui/color_utils.h"
 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/features.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/browser_resources.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
@@ skipping 40 matching lines @@
 #endif
 
 // The URL for the Learn More page shown on guest session new tab.
 const char kLearnMoreGuestSessionUrl[] =
 #if defined(OS_CHROMEOS)
     "https://support.google.com/chromebook/?p=chromebook_guest";
 #else
     "https://support.google.com/chrome/?p=ui_guest";
 #endif
 
-std::string SkColorToRGBAString(SkColor color) {
-  // We convert the alpha using DoubleToString because StringPrintf will use
-  // locale specific formatters (e.g., use , instead of . in German).
-  return base::StringPrintf(
-      "rgba(%d,%d,%d,%s)",
-      SkColorGetR(color),
-      SkColorGetG(color),
-      SkColorGetB(color),
-      base::DoubleToString(SkColorGetA(color) / 255.0).c_str());
-}
-
-// Creates an rgb string for an SkColor, but leaves the alpha blank so that the
-// css can fill it in.
-std::string SkColorToRGBComponents(SkColor color) {
-  return base::StringPrintf(
-      "%d,%d,%d",
-      SkColorGetR(color),
-      SkColorGetG(color),
-      SkColorGetB(color));
-}
-
 SkColor GetThemeColor(const ui::ThemeProvider& tp, int id) {
   SkColor color = tp.GetColor(id);
   // If web contents are being inverted because the system is in high-contrast
   // mode, any system theme colors we use must be inverted too to cancel out.
   return color_utils::IsInvertedColorScheme() ?
       color_utils::InvertColor(color) : color;
 }
 
 // Get the CSS string for the background position on the new tab page for the
 // states when the bar is attached or detached.
@@ skipping 389 matching lines @@
           : SkColorSetRGB(0x32, 0x32, 0x32);
 
   // Generate the replacements.
   ui::TemplateReplacements substitutions;
 
   // Cache-buster for background.
   substitutions["themeId"] =
       profile_->GetPrefs()->GetString(prefs::kCurrentThemeID);
 
   // Colors.
-  substitutions["colorBackground"] = SkColorToRGBAString(color_background);
+  substitutions["colorBackground"] =
+      ColorUtils::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.
@@ skipping 31 matching lines @@
                      SkColorGetB(color_header));
 
   // Generate the replacements.
   ui::TemplateReplacements substitutions;
 
   // Cache-buster for background.
   substitutions["themeId"] =
       profile_->GetPrefs()->GetString(prefs::kCurrentThemeID);
 
   // Colors.
-  substitutions["colorBackground"] = SkColorToRGBAString(color_background);
+  substitutions["colorBackground"] =
+      ColorUtils::SkColorToRGBAString(color_background);
   substitutions["backgroundBarDetached"] = GetNewTabBackgroundCSS(tp, false);
   substitutions["backgroundBarAttached"] = GetNewTabBackgroundCSS(tp, true);
   substitutions["backgroundTiling"] = GetNewTabBackgroundTilingCSS(tp);
-  substitutions["colorTextRgba"] = SkColorToRGBAString(color_text);
-  substitutions["colorTextLight"] = SkColorToRGBAString(color_text_light);
+  substitutions["colorTextRgba"] = ColorUtils::SkColorToRGBAString(color_text);
+  substitutions["colorTextLight"] =
+      ColorUtils::SkColorToRGBAString(color_text_light);
   substitutions["colorSectionBorder"] =
-      SkColorToRGBComponents(color_section_border);
-  substitutions["colorText"] = SkColorToRGBComponents(color_text);
+      ColorUtils::SkColorToRGBComponents(color_section_border);
+  substitutions["colorText"] = ColorUtils::SkColorToRGBComponents(color_text);
 
   // For themes that right-align the background, we flip the attribution to the
   // left to avoid conflicts.
   int alignment =
       tp.GetDisplayProperty(ThemeProperties::NTP_BACKGROUND_ALIGNMENT);
   if (alignment & ThemeProperties::ALIGN_RIGHT) {
     substitutions["leftAlignAttribution"] = "0";
     substitutions["rightAlignAttribution"] = "auto";
     substitutions["textAlignAttribution"] = "right";
   } else {
     substitutions["leftAlignAttribution"] = "auto";
     substitutions["rightAlignAttribution"] = "0";
     substitutions["textAlignAttribution"] = "left";
   }
 
   substitutions["displayAttribution"] =
       tp.HasCustomImage(IDR_THEME_NTP_ATTRIBUTION) ? "inline" : "none";
 
   // 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);
 }