| 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..80c0f22af80fbba3de87257f8dc2362746f8aeed 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;
|
| }
|
|
|
| @@ -157,10 +159,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(
|
| + login_profile_ ? NULL : pref_service_,
|
| + network.profile_path(),
|
| + network.onc_source());
|
| }
|
| }
|
|
|
|
|