diff options
| author | mdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-13 19:59:30 +0000 |
|---|---|---|
| committer | mdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-13 19:59:30 +0000 |
| commit | d1f9d471997d01d1266c43bcb6c6457c4396177d (patch) | |
| tree | d9ecf1872ac97bc46bab2ed75593fdb1ea087e10 | |
| parent | 4007d671b58184dc4f59829e1119a69c9dfed132 (diff) | |
| download | chromium_src-d1f9d471997d01d1266c43bcb6c6457c4396177d.zip chromium_src-d1f9d471997d01d1266c43bcb6c6457c4396177d.tar.gz chromium_src-d1f9d471997d01d1266c43bcb6c6457c4396177d.tar.bz2 | |
Correctly update gconf proxy settings on Linux.
BUG=19229
TEST=set gnome proxy settings, start chromium, change proxy settings, change proxy settings *back*, see that they correctly update in chromium
Review URL: http://codereview.chromium.org/164497
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23346 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/proxy/proxy_config_service_linux.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc index 3c74c4d..855c6a4 100644 --- a/net/proxy/proxy_config_service_linux.cc +++ b/net/proxy/proxy_config_service_linux.cc @@ -512,7 +512,7 @@ void ProxyConfigServiceLinux::Delegate::SetupAndFetchInitialConfig( glib_default_loop_ = glib_default_loop; io_loop_ = io_loop; - // If we are passed a NULL io_loop, then we don't setup gconf + // If we are passed a NULL io_loop, then we don't set up gconf // notifications. This should not be the usual case but is intended // to simplify test setups. if (!io_loop_) @@ -612,6 +612,8 @@ void ProxyConfigServiceLinux::Delegate::OnCheckProxyConfigSettings() { this, &ProxyConfigServiceLinux::Delegate::SetNewProxyConfig, new_config)); + // Update the thread-private copy in |reference_config_| as well. + reference_config_ = new_config; } } |