Add a Canary-specific icon in VisualElementsManifest.xml

chrome/installer/setup/install.cc

Index: chrome/installer/setup/install.cc
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc
index d7d2351ad592e91beeedde6cd0be56feb3c7f66c..862534c48336fd5b75f66ec67aa112bffe3944de 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -43,7 +43,6 @@
 #include "chrome/installer/util/work_item.h"
 #include "chrome/installer/util/work_item_list.h"
 
-
 namespace {
 
 void LogShortcutOperation(ShellUtil::ShortcutLocation location,
@@ -390,9 +389,9 @@ bool CreateVisualElementsManifest(const base::FilePath& src_path,
             "xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>\r\n"
         "  <VisualElements\r\n"
         "      ShowNameOnSquare150x150Logo='on'\r\n"
-        "      Square150x150Logo='%ls\\Logo.png'\r\n"
-        "      Square70x70Logo='%ls\\SmallLogo.png'\r\n"
-        "      Square44x44Logo='%ls\\SmallLogo.png'\r\n"
+        "      Square150x150Logo='%ls\\Logo%ls.png'\r\n"
+        "      Square70x70Logo='%ls\\SmallLogo%ls.png'\r\n"
+        "      Square44x44Logo='%ls\\SmallLogo%ls.png'\r\n"
         "      ForegroundText='light'\r\n"
         "      BackgroundColor='#212121'/>\r\n"
         "</Application>\r\n";
@@ -408,9 +407,11 @@ bool CreateVisualElementsManifest(const base::FilePath& src_path,
     EscapeXmlAttributeValueInSingleQuotes(&display_name);
 
     // Fill the manifest with the desired values.
-    base::string16 manifest16(
-        base::StringPrintf(manifest_template.c_str(), elements_dir.c_str(),
-                           elements_dir.c_str(), elements_dir.c_str()));
+    const base::char16* canary_str =
+        InstallUtil::IsChromeSxSProcess() ? L"Canary" : L"";

[scottmg, 2016/08/24 20:35:41]

Did you want GOOGLE_CHROME_BRANDED around this? It sort of looks like
IsChromeSxSProcess() should be false for Chromium, but maybe I'm misreading it.

[grt (UTC plus 2), 2016/08/25 10:22:56]

Naah. I think it'd be better for CheckIsChromeSxSProcess to just return false on
Chromium builds. That's for another CL, though.

+    base::string16 manifest16(base::StringPrintf(
+        manifest_template.c_str(), elements_dir.c_str(), canary_str,
+        elements_dir.c_str(), canary_str, elements_dir.c_str(), canary_str));
 
     // Write the manifest to |src_path|.
     const std::string manifest(base::UTF16ToUTF8(manifest16));