summaryrefslogtreecommitdiffstats
path: root/chrome/installer/util/shell_util.cc
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-13 02:07:25 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-13 02:07:25 +0000
commitb7e0a2a3ccf5aceb891d5e1dfaf9db1bbaaa5f78 (patch)
treed723b8556ad386a0b8a6e999e3a842e0bfe6f9b0 /chrome/installer/util/shell_util.cc
parent1976d41ac728fcceb30f2df3c243cb7417f538f1 (diff)
downloadchromium_src-b7e0a2a3ccf5aceb891d5e1dfaf9db1bbaaa5f78.zip
chromium_src-b7e0a2a3ccf5aceb891d5e1dfaf9db1bbaaa5f78.tar.gz
chromium_src-b7e0a2a3ccf5aceb891d5e1dfaf9db1bbaaa5f78.tar.bz2
Use ASCII strings for switch names.
Review URL: http://codereview.chromium.org/270062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/shell_util.cc')
-rw-r--r--chrome/installer/util/shell_util.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc
index c4705a8..86e588b 100644
--- a/chrome/installer/util/shell_util.cc
+++ b/chrome/installer/util/shell_util.cc
@@ -81,12 +81,13 @@ class 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");
@@ -286,7 +287,7 @@ bool IsChromeRegistered(const std::wstring& chrome_exe,
return registered;
}
-// This method registers Chrome on Vista by launching eleavated setup.exe.
+// This method registers Chrome on Vista by launching eleavated setup.exe.
// That will show user standard Vista elevation prompt. If user accepts it
// the new process will make the necessary changes and return SUCCESS that
// we capture and return.