Use ASCII strings for switch names.

chrome/installer/util/shell_util.cc

 // Copyright (c) 2009 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.
 //
 // This file defines functions that integrate Chrome in Windows shell. These
 // functions can be used by Chrome as well as Chrome installer. All of the
 // work is done by the local functions defined in anonymous namespace in
 // this class.
 
 #include "chrome/installer/util/shell_util.h"
@@ skipping 63 matching lines @@
     std::wstring app_name = dist->GetApplicationName() + suffix;
     std::wstring start_menu_entry(ShellUtil::kRegStartMenuInternet);
     start_menu_entry.append(L"\\" + app_name);
     entries->push_front(new RegistryEntry(start_menu_entry, app_name));
     entries->push_front(new RegistryEntry(
         start_menu_entry + ShellUtil::kRegShellOpen, quoted_exe_path));
     entries->push_front(new RegistryEntry(
         start_menu_entry + ShellUtil::kRegDefaultIcon, icon_path));
 
     std::wstring install_info(start_menu_entry + L"\\InstallInfo");
+    // TODO: use CommandLine API instead of constructing command lines.
     entries->push_front(new RegistryEntry(install_info, L"ReinstallCommand",
-        quoted_exe_path + L" --" + switches::kMakeDefaultBrowser));
+        quoted_exe_path + L" --" + ASCIIToWide(switches::kMakeDefaultBrowser)));
     entries->push_front(new RegistryEntry(install_info, L"HideIconsCommand",
-        quoted_exe_path + L" --" + switches::kHideIcons));
+        quoted_exe_path + L" --" + ASCIIToWide(switches::kHideIcons)));
     entries->push_front(new RegistryEntry(install_info, L"ShowIconsCommand",
-        quoted_exe_path + L" --" + switches::kShowIcons));
+        quoted_exe_path + L" --" + ASCIIToWide(switches::kShowIcons)));
     entries->push_front(new RegistryEntry(install_info, L"IconsVisible", 1));
 
     std::wstring capabilities(start_menu_entry + L"\\Capabilities");
     entries->push_front(new RegistryEntry(ShellUtil::kRegRegisteredApplications,
         app_name, capabilities));
     entries->push_front(new RegistryEntry(
         capabilities, L"ApplicationDescription", dist->GetApplicationName()));
     entries->push_front(new RegistryEntry(
         capabilities, L"ApplicationIcon", icon_path));
     entries->push_front(new RegistryEntry(
@@ skipping 671 matching lines @@
   } else {
     return file_util::UpdateShortcutLink(chrome_exe.c_str(),      // target
                                          shortcut.c_str(),        // shortcut
                                          chrome_path.c_str(),     // working dir
                                          NULL,                    // arguments
                                          description.c_str(),     // description
                                          chrome_exe.c_str(),      // icon file
                                          0);                      // icon index
   }
 }