Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6841)

Unified Diff: chrome/installer/util/google_chrome_distribution.cc

Issue 4989001: Attempt to reland http://codereview.chromium.org/4928002/... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/setup/uninstall.cc ('k') | chrome/installer/util/install_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/google_chrome_distribution.cc
===================================================================
--- chrome/installer/util/google_chrome_distribution.cc (revision 66087)
+++ chrome/installer/util/google_chrome_distribution.cc (working copy)
@@ -139,15 +139,14 @@
// Re-add the system level toast flag.
if (system_level_toast) {
- new_cmd_line.AppendSwitch(
- WideToASCII(installer_util::switches::kSystemLevelToast));
+ new_cmd_line.AppendSwitch(installer_util::switches::kSystemLevelToast);
// Re-add the toast result key. We need to do this because Setup running as
// system passes the key to Setup running as user, but that child process
// does not perform the actual toasting, it launches another Setup (as user)
// to do so. That is the process that needs the key.
const CommandLine& current_cmd_line = *CommandLine::ForCurrentProcess();
- std::string key = WideToASCII(installer_util::switches::kToastResultsKey);
+ std::string key(installer_util::switches::kToastResultsKey);
std::string toast_key = current_cmd_line.GetSwitchValueASCII(key);
if (!toast_key.empty()) {
new_cmd_line.AppendSwitchASCII(key, toast_key);
@@ -217,17 +216,16 @@
// the computer is on but nobody has logged in locally.
// Remote Desktop sessions do not count as interactive sessions; running this
// method as a user logged in via remote desktop will do nothing.
-bool RelaunchSetupAsConsoleUser(const std::wstring& flag) {
+bool RelaunchSetupAsConsoleUser(const std::string& flag) {
FilePath setup_exe = CommandLine::ForCurrentProcess()->GetProgram();
CommandLine cmd_line(setup_exe);
- cmd_line.AppendSwitch(WideToASCII(flag));
+ cmd_line.AppendSwitch(flag);
// Get the Google Update results key, and pass it on the command line to
// the child process.
int key = GoogleUpdateSettings::DuplicateGoogleUpdateSystemClientKey();
- cmd_line.AppendSwitchASCII(
- WideToASCII(installer_util::switches::kToastResultsKey),
- base::IntToString(key));
+ cmd_line.AppendSwitchASCII(installer_util::switches::kToastResultsKey,
+ base::IntToString(key));
if (base::win::GetVersion() > base::win::VERSION_XP) {
// Make sure that in Vista and Above we have the proper DACLs so
@@ -530,7 +528,7 @@
if (cmd_line.HasSwitch(installer_util::switches::kToastResultsKey)) {
// Get the handle to the key under HKLM.
base::StringToInt(cmd_line.GetSwitchValueASCII(
- WideToASCII(installer_util::switches::kToastResultsKey)).c_str(),
+ installer_util::switches::kToastResultsKey).c_str(),
&reg_key_handle);
} else {
reg_key_handle = 0;
« no previous file with comments | « chrome/installer/setup/uninstall.cc ('k') | chrome/installer/util/install_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698