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

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

Issue 7386002: Rename CommandLine::GetCommandLineString(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge, use writable string copies, restore TODO comment and empty string compare. Created 9 years, 5 months 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
Index: chrome/installer/util/google_chrome_distribution.cc
diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc
index 11d2128adb4841a3d6c599de4522a647f78d2cf1..7e71495f0a332f8f25b2dccdd14f0486f347c945 100644
--- a/chrome/installer/util/google_chrome_distribution.cc
+++ b/chrome/installer/util/google_chrome_distribution.cc
@@ -140,11 +140,11 @@ bool LaunchSetup(CommandLine cmd_line, bool system_level_toast) {
// Use handle inheritance to make sure the duplicated toast results key
// gets inherited by the child process.
return base::LaunchAppWithHandleInheritance(
- cmd_line.command_line_string(), false, false, NULL);
+ cmd_line.GetCommandLineString(), false, false, NULL);
}
}
- return base::LaunchApp(cmd_line.command_line_string(),
+ return base::LaunchApp(cmd_line.GetCommandLineString(),
false, false, NULL);
}
@@ -232,7 +232,7 @@ bool LaunchSetupAsConsoleUser(const FilePath& setup_path,
// Note: Handle inheritance must be true in order for the child process to be
// able to use the duplicated handle above (Google Update results).
bool launched = base::LaunchAppAsUser(user_token,
- cmd_line.command_line_string(),
+ cmd_line.GetCommandLineString(),
false, NULL, true, true);
::CloseHandle(user_token);
return launched;
@@ -766,7 +766,7 @@ void GoogleChromeDistribution::InactiveUserToastExperiment(int flavor,
// The command line should now have the url added as:
// "chrome.exe -- <url>"
DCHECK_NE(std::wstring::npos,
- options.command_line_string().find(L" -- " + url));
+ options.GetCommandLineString().find(L" -- " + url));
}
// Launch chrome now. It will show the toast UI.
int32 exit_code = 0;

Powered by Google App Engine
This is Rietveld 408576698