diff options
| author | kuan@chromium.org <kuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-17 02:54:25 +0000 |
|---|---|---|
| committer | kuan@chromium.org <kuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-17 02:54:25 +0000 |
| commit | ea9cc91454f9c0b8f6fb0dd9ea402586ae7bdaee (patch) | |
| tree | 7492cbc757466e69d574c88c4d757d8ec2900d62 | |
| parent | 3226c91e4940a1d6392ca792a8d55407ce7d351f (diff) | |
| download | chromium_src-ea9cc91454f9c0b8f6fb0dd9ea402586ae7bdaee.zip chromium_src-ea9cc91454f9c0b8f6fb0dd9ea402586ae7bdaee.tar.gz chromium_src-ea9cc91454f9c0b8f6fb0dd9ea402586ae7bdaee.tar.bz2 | |
chromeos: fix bug where ui doesn't reflect actual proxy used when non-shared
network replaces its corresponding shared one after login
BUG=chromium-os:20433
TEST=verfiy per bug rpt
Review URL: http://codereview.chromium.org/7919005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101632 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/proxy_config_service_impl.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/proxy_config_service_impl.cc b/chrome/browser/chromeos/proxy_config_service_impl.cc index 22dbf0a..9500394 100644 --- a/chrome/browser/chromeos/proxy_config_service_impl.cc +++ b/chrome/browser/chromeos/proxy_config_service_impl.cc @@ -538,6 +538,14 @@ bool ProxyConfigServiceImpl::UIMakeActiveNetworkCurrent() { void ProxyConfigServiceImpl::UISetUseSharedProxies(bool use_shared) { // Should be called from UI thread. CheckCurrentlyOnUIThread(); + + // Reset all UI-related variables so that the next opening of proxy + // configuration dialog of any network will trigger javascript reloading of + // (possibly) new proxy settings. + current_ui_network_.clear(); + current_ui_network_name_.clear(); + current_ui_config_ = ProxyConfig(); + if (use_shared_proxies_ == use_shared) { VLOG(1) << "same use_shared_proxies = " << use_shared_proxies_; return; |