Chromium Code Reviews| Index: chrome/browser/chromeos/login/login_utils.cc |
| diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc |
| index 899965f930826bf75eb2c75779c1cf480ce8e221..3e8c117214f08a4cff98ed497278294b03dacb44 100644 |
| --- a/chrome/browser/chromeos/login/login_utils.cc |
| +++ b/chrome/browser/chromeos/login/login_utils.cc |
| @@ -789,6 +789,12 @@ void LoginUtilsImpl::OnProfileCreated( |
| user_profile->GetPrefs(), NULL); |
| google_services_username.SetValue( |
| UserManager::Get()->logged_in_user().display_email()); |
| + // Make sure we flip every profile to not share proxies if the user hasn't |
|
Nikita (slow)
2012/02/01 09:42:34
Seems that if Chrome crashes inside user session,
pastarmovj
2012/02/01 09:57:31
Yes, theoretically if Chrome crashes right after t
|
| + // specified so explicitly. |
| + const PrefService::Preference* use_shared_proxies_pref = |
| + user_profile->GetPrefs()->FindPreference(prefs::kUseSharedProxies); |
| + if (use_shared_proxies_pref->IsDefaultValue()) |
| + user_profile->GetPrefs()->SetBoolean(prefs::kUseSharedProxies, false); |
| RespectLocalePreference(user_profile); |
| return; |
| } |
| @@ -891,8 +897,8 @@ void LoginUtilsImpl::StartTokenServices(Profile* user_profile) { |
| if (!ReadOAuth1AccessToken(user_profile, &oauth1_token, &oauth1_secret)) |
| return; |
| - FetchSecondaryTokens(user_profile->GetOffTheRecordProfile(), oauth1_token, |
| - oauth1_secret); |
| + FetchSecondaryTokens(user_profile->GetOffTheRecordProfile(), |
| + oauth1_token, oauth1_secret); |
| } |
| void LoginUtilsImpl::StartSignedInServices( |
| @@ -1280,9 +1286,9 @@ void LoginUtilsImpl::FetchPolicyToken(Profile* offrecord_profile, |
| // Fetch dm service token now, if it hasn't been fetched yet. |
| if (!policy_oauth_fetcher_.get() || policy_oauth_fetcher_->failed()) { |
| // Trigger oauth token fetch for user policy. |
| - policy_oauth_fetcher_.reset(new PolicyOAuthFetcher(offrecord_profile, |
| - token, |
| - secret)); |
| + policy_oauth_fetcher_.reset( |
| + new PolicyOAuthFetcher(authenticator_->authentication_profile(), |
| + token, secret)); |
| policy_oauth_fetcher_->Start(); |
| } |