summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/proxy_config_service_impl.cc
diff options
context:
space:
mode:
authornkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-06 21:57:10 +0000
committernkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-06 21:57:10 +0000
commita43c12eca09571cc104fdfd0c004b61d8b916d76 (patch)
tree5be5a1025953630076547cca36d31e4aaae94899 /chrome/browser/chromeos/proxy_config_service_impl.cc
parent65eab73ea4fdd15d50d3467e3d1e21fac5c8f649 (diff)
downloadchromium_src-a43c12eca09571cc104fdfd0c004b61d8b916d76.zip
chromium_src-a43c12eca09571cc104fdfd0c004b61d8b916d76.tar.gz
chromium_src-a43c12eca09571cc104fdfd0c004b61d8b916d76.tar.bz2
Renaming virtual setters/getters in UserManager.
Follow up CL for http://codereview.chromium.org/9348022/ * Renamed unix_hacker to CamelStyle methods from UserManager as they are not non-virtual getters and setters any more. - user_is_logged_in() - logged_in_user() - current_user_is_owner() / set_current_user_is_owner() - current_user_is_new() - downloaded_profile_image() BUG=None TEST=None Review URL: https://chromiumcodereview.appspot.com/9355059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125230 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/proxy_config_service_impl.cc')
-rw-r--r--chrome/browser/chromeos/proxy_config_service_impl.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/proxy_config_service_impl.cc b/chrome/browser/chromeos/proxy_config_service_impl.cc
index 362ac09..9fdf48e 100644
--- a/chrome/browser/chromeos/proxy_config_service_impl.cc
+++ b/chrome/browser/chromeos/proxy_config_service_impl.cc
@@ -693,8 +693,10 @@ void ProxyConfigServiceImpl::SetProxyConfigForNetwork(
bool ProxyConfigServiceImpl::GetUseSharedProxies() {
const PrefService::Preference* use_shared_proxies_pref =
prefs()->FindPreference(prefs::kUseSharedProxies);
- if (!use_shared_proxies_pref)
- return !UserManager::Get()->user_is_logged_in();
+ if (!use_shared_proxies_pref) {
+ // Make sure that proxies are always enabled at sign in screen.
+ return !UserManager::Get()->IsUserLoggedIn();
+ }
return use_shared_proxies_.GetValue();
}