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

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

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
Index: chrome/browser/chromeos/ui_proxy_config_service.h
diff --git a/chrome/browser/chromeos/ui_proxy_config_service.h b/chrome/browser/chromeos/ui_proxy_config_service.h
index 05d867e572faf5c54ec0f358620cd22bd90cd17c..f9d0de3becf0c7b7481c567068ac561d6a3b4264 100644
--- a/chrome/browser/chromeos/ui_proxy_config_service.h
+++ b/chrome/browser/chromeos/ui_proxy_config_service.h
@@ -28,7 +28,13 @@ class UIProxyConfigService {
UIProxyConfigService();
~UIProxyConfigService();
- void SetPrefs(PrefService* prefs);
+ // |signin_screen| indicates whether this object is used for the
+ // signin screen, in which case proxies of (shared) networks are
+ // unconditionally respected. After signin, proxy settings of shared networks
+ // may be ignored, e.g. depending on the kUseSharedProxies flag. After this
+ // call, proxy settings are read from
+ // |prefs|.
+ void SetPrefs(bool signin_screen, PrefService* prefs);
// Called by UI to set the network with service path |current_network| to be
// displayed or edited. Subsequent Set*/Get* methods will use this
@@ -58,6 +64,7 @@ class UIProxyConfigService {
// Proxy configuration of |current_ui_network_|.
UIProxyConfig current_ui_config_;
+ bool signin_screen_;
PrefService* pref_service_;
DISALLOW_COPY_AND_ASSIGN(UIProxyConfigService);
« no previous file with comments | « chrome/browser/chromeos/proxy_config_service_impl_unittest.cc ('k') | chrome/browser/chromeos/ui_proxy_config_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698