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

Unified Diff: chrome/browser/chromeos/ui_proxy_config_service.cc

Issue 18112018: Cleanup the UseSharedProxies preference. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added missing include. Created 7 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/browser/chromeos/ui_proxy_config_service.cc
diff --git a/chrome/browser/chromeos/ui_proxy_config_service.cc b/chrome/browser/chromeos/ui_proxy_config_service.cc
index 0f6988a65c2a2c769d7d302e78c8ee4267007526..4c73caf999d408259191ac27241d86281092c1b7 100644
--- a/chrome/browser/chromeos/ui_proxy_config_service.cc
+++ b/chrome/browser/chromeos/ui_proxy_config_service.cc
@@ -62,7 +62,9 @@ UIProxyConfigService::UIProxyConfigService() {
UIProxyConfigService::~UIProxyConfigService() {
}
-void UIProxyConfigService::SetPrefs(PrefService* pref_service) {
+void UIProxyConfigService::SetPrefs(bool login_profile,
+ PrefService* pref_service) {
+ login_profile_ = login_profile;
pref_service_ = pref_service;
}
@@ -158,7 +160,8 @@ void UIProxyConfigService::DetermineEffectiveConfig(
current_ui_config_.user_modifiable = false;
} else {
current_ui_config_.user_modifiable =
- !ProxyConfigServiceImpl::IgnoreProxy(pref_service_,
+ !ProxyConfigServiceImpl::IgnoreProxy(login_profile_,
+ pref_service_,
network.profile_path(),
network.onc_source());
}

Powered by Google App Engine
This is Rietveld 408576698