Add a Canary-specific icon in VisualElementsManifest.xml

chrome/installer/setup/install.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/installer/setup/install.h"
 
 #include <windows.h>
 #include <shlobj.h>
 #include <time.h>
 
@@ skipping 25 matching lines @@
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/master_preferences_constants.h"
 #include "chrome/installer/util/set_reg_value_work_item.h"
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/util_constants.h"
 #include "chrome/installer/util/work_item.h"
 #include "chrome/installer/util/work_item_list.h"
 
-
 namespace {
 
 void LogShortcutOperation(ShellUtil::ShortcutLocation location,
                           BrowserDistribution* dist,
                           const ShellUtil::ShortcutProperties& properties,
                           ShellUtil::ShortcutOperation operation,
                           bool failed) {
   // ShellUtil::SHELL_SHORTCUT_UPDATE_EXISTING should not be used at install and
   // thus this method does not handle logging a message for it.
   DCHECK(operation != ShellUtil::SHELL_SHORTCUT_UPDATE_EXISTING);
@@ skipping 326 matching lines @@
   } else {
     // A printf-style format string for generating the visual elements
     // manifest. Required arguments, in order, are:
     //   - Localized display name for the product.
     //   - Relative path to the VisualElements directory, three times.
     static const char kManifestTemplate[] =
         "<Application "
             "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";
 
     const base::string16 manifest_template(
         base::ASCIIToUTF16(kManifestTemplate));
 
     BrowserDistribution* dist = BrowserDistribution::GetSpecificDistribution(
         BrowserDistribution::CHROME_BROWSER);
     // TODO(grt): http://crbug.com/75152 Write a reference to a localized
     // resource for |display_name|.
     base::string16 display_name(dist->GetDisplayName());
     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));
     int size = base::checked_cast<int>(manifest.size());
     if (base::WriteFile(
         src_path.Append(installer::kVisualElementsManifest),
             manifest.c_str(), size) == size) {
       VLOG(1) << "Successfully wrote " << installer::kVisualElementsManifest
               << " to " << src_path.value();
       return true;
@@ skipping 356 matching lines @@
   // Read master_preferences copied beside chrome.exe at install.
   MasterPreferences prefs(installation_root.AppendASCII(kDefaultMasterPrefs));
   base::FilePath chrome_exe(installation_root.Append(kChromeExe));
   CreateOrUpdateShortcuts(
       chrome_exe, chrome, prefs, CURRENT_USER, install_operation);
 
   UpdateDefaultBrowserBeaconForPath(chrome_exe);
 }
 
 }  // namespace installer