diff options
author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 22:10:30 +0000 |
---|---|---|
committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 22:10:30 +0000 |
commit | 0445eb4ed9f9a9bb86f8c4338f86a84fbce7b7f2 (patch) | |
tree | 63eb34b491bfec6af9a6c04361d21d86c086d7eb /chrome/browser/chromeos | |
parent | c2c263cd9f2ac658d6dc35ecbd4551ca0c5cb154 (diff) | |
download | chromium_src-0445eb4ed9f9a9bb86f8c4338f86a84fbce7b7f2.zip chromium_src-0445eb4ed9f9a9bb86f8c4338f86a84fbce7b7f2.tar.gz chromium_src-0445eb4ed9f9a9bb86f8c4338f86a84fbce7b7f2.tar.bz2 |
CommandLine: eliminate wstring-accepting AppendLooseValue
Instead use AppendArg variants which accept a FilePath or an ASCII string.
Review URL: http://codereview.chromium.org/3134008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56100 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
4 files changed, 7 insertions, 11 deletions
diff --git a/chrome/browser/chromeos/login/apply_services_customization.cc b/chrome/browser/chromeos/login/apply_services_customization.cc index d310d32..d455ded 100644 --- a/chrome/browser/chromeos/login/apply_services_customization.cc +++ b/chrome/browser/chromeos/login/apply_services_customization.cc @@ -136,8 +136,8 @@ void ApplyServicesCustomization::Apply(const std::string& manifest) { if (!customization.initial_start_page_url().empty()) { // Append partner's start page url to command line so it gets opened // on browser startup. - CommandLine::ForCurrentProcess()->AppendLooseValue( - UTF8ToWide(customization.initial_start_page_url())); + CommandLine::ForCurrentProcess()->AppendArg( + customization.initial_start_page_url()); LOG(INFO) << "initial_start_page_url: " << customization.initial_start_page_url(); } diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc index 2aa1ede..6907a3c 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.cc +++ b/chrome/browser/chromeos/login/existing_user_controller.cc @@ -333,10 +333,8 @@ void ExistingUserController::OnLoginFailure(const std::string& error) { } void ExistingUserController::AppendStartUrlToCmdline() { - if (start_url_.is_valid()) { - CommandLine::ForCurrentProcess()->AppendLooseValue( - UTF8ToWide(start_url_.spec())); - } + if (start_url_.is_valid()) + CommandLine::ForCurrentProcess()->AppendArg(start_url_.spec()); } void ExistingUserController::ClearCaptchaState() { diff --git a/chrome/browser/chromeos/login/login_screen.cc b/chrome/browser/chromeos/login/login_screen.cc index ddd71df..f150163 100644 --- a/chrome/browser/chromeos/login/login_screen.cc +++ b/chrome/browser/chromeos/login/login_screen.cc @@ -104,10 +104,8 @@ void LoginScreen::OnOffTheRecordLoginSuccess() { } void LoginScreen::AppendStartUrlToCmdline() { - if (start_url_.is_valid()) { - CommandLine::ForCurrentProcess()->AppendLooseValue( - UTF8ToWide(start_url_.spec())); - } + if (start_url_.is_valid()) + CommandLine::ForCurrentProcess()->AppendArg(start_url_.spec()); } void LoginScreen::ShowError(int error_id, const std::string& details) { diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc index eda8d60..9d6df17 100644 --- a/chrome/browser/chromeos/login/login_utils.cc +++ b/chrome/browser/chromeos/login/login_utils.cc @@ -205,7 +205,7 @@ void LoginUtilsImpl::CompleteOffTheRecordLogin(const GURL& start_url) { switches::kLoginUser, UserManager::Get()->logged_in_user().email()); if (start_url.is_valid()) - command_line.AppendLooseValue(UTF8ToWide(start_url.spec())); + command_line.AppendArg(start_url.spec()); CrosLibrary::Get()->GetLoginLibrary()->RestartJob( getpid(), command_line.command_line_string()); |