Specify a white bg color when light assets are used for Chrome's logo.

The bg color is used in such places as the Notification Center and the
start menu. This makes them look more like the Start Menu tile, which
has a white background of its own.

BUG=722573

Change-Id: I413b89340a34f5f2700528ff058c4432feb38883
Reviewed-on: https://chromium-review.googlesource.com/1013465Reviewed-by: Scott Graham <scottmg@chromium.org>
Commit-Queue: Greg Thompson <grt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551453}

chrome/installer/setup/install.cc

@@ -273,6 +273,7 @@ std::string GenerateVisualElementsManifest(const base::Version& version,
   //   - "Light" or "", according to |use_light_assets|.
   // followed by:
   //   - Foreground text value (light or dark).
+  //   - Background color.
   static constexpr char kManifestTemplate[] =
       "<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>\r\n"
       "  <VisualElements\r\n"
@@ -281,7 +282,7 @@ std::string GenerateVisualElementsManifest(const base::Version& version,
       "      Square70x70Logo='%ls\\SmallLogo%ls%ls.png'\r\n"
       "      Square44x44Logo='%ls\\SmallLogo%ls%ls.png'\r\n"
       "      ForegroundText='%ls'\r\n"
-      "      BackgroundColor='#212121'/>\r\n"
+      "      BackgroundColor='%ls'/>\r\n"
       "</Application>\r\n";
   static constexpr wchar_t kLight[] = L"Light";
 
@@ -300,7 +301,8 @@ std::string GenerateVisualElementsManifest(const base::Version& version,
       manifest_template.c_str(), elements_dir.c_str(), logo_suffix,
       light_suffix, elements_dir.c_str(), logo_suffix, light_suffix,
       elements_dir.c_str(), logo_suffix, light_suffix,
-      use_light_assets ? L"dark" : L"light"));
+      use_light_assets ? L"dark" : L"light",
+      use_light_assets ? L"#FFFFFF" : L"#212121"));
 
   return base::UTF16ToUTF8(manifest16);
 }

chrome/installer/setup/install_unittest.cc

@@ -171,7 +171,7 @@ constexpr char kExpectedPrimaryLightManifest[] =
     "      Square70x70Logo='0.0.0.0\\VisualElements\\SmallLogoLight.png'\r\n"
     "      Square44x44Logo='0.0.0.0\\VisualElements\\SmallLogoLight.png'\r\n"
     "      ForegroundText='dark'\r\n"
-    "      BackgroundColor='#212121'/>\r\n"
+    "      BackgroundColor='#FFFFFF'/>\r\n"
     "</Application>\r\n";
 
 #if defined(GOOGLE_CHROME_BUILD)
@@ -196,7 +196,7 @@ constexpr char kExpectedBetaLightManifest[] =
     "      "
     "Square44x44Logo='0.0.0.0\\VisualElements\\SmallLogoBetaLight.png'\r\n"
     "      ForegroundText='dark'\r\n"
-    "      BackgroundColor='#212121'/>\r\n"
+    "      BackgroundColor='#FFFFFF'/>\r\n"
     "</Application>\r\n";
 
 constexpr char kExpectedDevManifest[] =
@@ -218,7 +218,7 @@ constexpr char kExpectedDevLightManifest[] =
     "      Square70x70Logo='0.0.0.0\\VisualElements\\SmallLogoDevLight.png'\r\n"
     "      Square44x44Logo='0.0.0.0\\VisualElements\\SmallLogoDevLight.png'\r\n"
     "      ForegroundText='dark'\r\n"
-    "      BackgroundColor='#212121'/>\r\n"
+    "      BackgroundColor='#FFFFFF'/>\r\n"
     "</Application>\r\n";
 
 constexpr char kExpectedCanaryManifest[] =