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

Unified Diff: chrome/browser/chromeos/login/login_utils.cc

Issue 9309024: Quick-and-dirty hacks for getting policy working behind proxies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 11 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/proxy_config_service_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
+ // 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();
}
« no previous file with comments | « no previous file | chrome/browser/chromeos/proxy_config_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698