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

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: Rebased. 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
« no previous file with comments | « chrome/browser/chromeos/ui_proxy_config_service.h ('k') | chrome/browser/io_thread.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..a7925a9cfc9eb952610212580038af0f9312f1de 100644
--- a/chrome/browser/chromeos/ui_proxy_config_service.cc
+++ b/chrome/browser/chromeos/ui_proxy_config_service.cc
@@ -56,13 +56,17 @@ bool IsNetworkProxySettingsEditable(const NetworkState& network) {
} // namespace
-UIProxyConfigService::UIProxyConfigService() {
+UIProxyConfigService::UIProxyConfigService()
+ : signin_screen_(false),
+ pref_service_(NULL) {
}
UIProxyConfigService::~UIProxyConfigService() {
}
-void UIProxyConfigService::SetPrefs(PrefService* pref_service) {
+void UIProxyConfigService::SetPrefs(bool signin_screen,
+ PrefService* pref_service) {
+ signin_screen_ = signin_screen;
pref_service_ = pref_service;
}
@@ -157,10 +161,10 @@ void UIProxyConfigService::DetermineEffectiveConfig(
current_ui_config_.state = ProxyPrefs::CONFIG_POLICY;
current_ui_config_.user_modifiable = false;
} else {
- current_ui_config_.user_modifiable =
- !ProxyConfigServiceImpl::IgnoreProxy(pref_service_,
- network.profile_path(),
- network.onc_source());
+ current_ui_config_.user_modifiable = !ProxyConfigServiceImpl::IgnoreProxy(
+ signin_screen_ ? NULL : pref_service_,
+ network.profile_path(),
+ network.onc_source());
}
}
« no previous file with comments | « chrome/browser/chromeos/ui_proxy_config_service.h ('k') | chrome/browser/io_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698