redesign and reimplement proxy config service and tracker, revise proxy ui on cros

chrome/browser/net/pref_proxy_config_service.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/net/pref_proxy_config_service.h"
 
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/pref_set_observer.h"
 #include "chrome/browser/prefs/proxy_config_dictionary.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
 
 PrefProxyConfigTracker::PrefProxyConfigTracker(PrefService* pref_service)
     : pref_service_(pref_service) {
-  config_state_ = ReadPrefConfig(&pref_config_);
+  ui_config_state_ = ReadPrefConfig(&ui_pref_config_);
+  io_config_state_ = ui_config_state_;
+  io_pref_config_ = ui_pref_config_;
   proxy_prefs_observer_.reset(
       PrefSetObserver::CreateProxyPrefSetObserver(pref_service_, this));
 }
 
 PrefProxyConfigTracker::~PrefProxyConfigTracker() {
   DCHECK(pref_service_ == NULL);
 }
 
 PrefProxyConfigTracker::ConfigState
-    PrefProxyConfigTracker::GetProxyConfig(net::ProxyConfig* config) {
+    PrefProxyConfigTracker::IOGetProxyConfig(net::ProxyConfig* config) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  if (config_state_ != CONFIG_UNSET)
-    *config = pref_config_;
-  return config_state_;
+  if (io_config_state_ != CONFIG_UNSET)
+    *config = io_pref_config_;
+  return io_config_state_;
+}
+
+PrefProxyConfigTracker::ConfigState
+    PrefProxyConfigTracker::UIGetProxyConfig(net::ProxyConfig* config) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  if (ui_config_state_ != CONFIG_UNSET)
+    *config = ui_pref_config_;
+  return ui_config_state_;
 }
 
 void PrefProxyConfigTracker::DetachFromPrefService() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // Stop notifications.
   proxy_prefs_observer_.reset();
   pref_service_ = NULL;
 }
 
 void PrefProxyConfigTracker::AddObserver(
     PrefProxyConfigTracker::Observer* observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   observers_.AddObserver(observer);
 }
 
 void PrefProxyConfigTracker::RemoveObserver(
     PrefProxyConfigTracker::Observer* observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   observers_.RemoveObserver(observer);
 }
 
 void PrefProxyConfigTracker::Observe(int type,
                                      const NotificationSource& source,
                                      const NotificationDetails& details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (type == chrome::NOTIFICATION_PREF_CHANGED &&
       Source<PrefService>(source).ptr() == pref_service_) {
     net::ProxyConfig new_config;
     ConfigState config_state = ReadPrefConfig(&new_config);
-    BrowserThread::PostTask(
-        BrowserThread::IO, FROM_HERE,
-        NewRunnableMethod(this,
-                          &PrefProxyConfigTracker::InstallProxyConfig,
-                          new_config, config_state));
+    if (ui_config_state_ != config_state ||
+        (ui_config_state_ != CONFIG_UNSET &&

[Mattias Nissler (ping if slow), 2011/10/05 10:18:36]

nit: not breaking this line would make the thing more readable IMHO since it's
more obvious that there's only a config change if these two conditions are bot
true.

[kuan, 2011/10/07 00:30:41]

i didn't want to, but it won't fit, so i don't hv a choice.

On 2011/10/05 10:18:36, Mattias Nissler wrote:

+         !ui_pref_config_.Equals(new_config))) {
+      ui_config_state_ = config_state;
+      if (ui_config_state_ != CONFIG_UNSET)
+        ui_pref_config_ = new_config;
+      BrowserThread::PostTask(
+          BrowserThread::IO, FROM_HERE,
+          NewRunnableMethod(this,
+                            &PrefProxyConfigTracker::InstallProxyConfig,
+                            new_config, config_state));
+    }
   } else {
     NOTREACHED() << "Unexpected notification of type " << type;
   }
 }
 
 void PrefProxyConfigTracker::InstallProxyConfig(
     const net::ProxyConfig& config,
     PrefProxyConfigTracker::ConfigState config_state) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  if (config_state_ != config_state ||
-      (config_state_ != CONFIG_UNSET && !pref_config_.Equals(config))) {
-    config_state_ = config_state;
-    if (config_state_ != CONFIG_UNSET)
-      pref_config_ = config;
-    FOR_EACH_OBSERVER(Observer, observers_, OnPrefProxyConfigChanged());
-  }
+  io_config_state_ = config_state;
+  if (io_config_state_ != CONFIG_UNSET)
+    io_pref_config_ = config;
+  FOR_EACH_OBSERVER(Observer, observers_, OnPrefProxyConfigChanged());
 }
 
 PrefProxyConfigTracker::ConfigState
     PrefProxyConfigTracker::ReadPrefConfig(net::ProxyConfig* config) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Clear the configuration.
   *config = net::ProxyConfig();
 
   const PrefService::Preference* pref =
@@ skipping 97 matching lines @@
 void PrefProxyConfigService::RemoveObserver(
     net::ProxyConfigService::Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 net::ProxyConfigService::ConfigAvailability
     PrefProxyConfigService::GetLatestProxyConfig(net::ProxyConfig* config) {
   RegisterObservers();
   net::ProxyConfig pref_config;
   PrefProxyConfigTracker::ConfigState state =
-      pref_config_tracker_->GetProxyConfig(&pref_config);
+      pref_config_tracker_->IOGetProxyConfig(&pref_config);
   if (state == PrefProxyConfigTracker::CONFIG_PRESENT) {
     *config = pref_config;
     return CONFIG_VALID;
   }
 
   // Ask the base service.
   ConfigAvailability available = base_service_->GetLatestProxyConfig(config);
 
   // Base service doesn't have a configuration, fall back to prefs or default.
   if (available == CONFIG_UNSET) {
@@ skipping 13 matching lines @@
 
 void PrefProxyConfigService::OnProxyConfigChanged(
     const net::ProxyConfig& config,
     ConfigAvailability availability) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // Check whether there is a proxy configuration defined by preferences. In
   // this case that proxy configuration takes precedence and the change event
   // from the delegate proxy service can be disregarded.
   net::ProxyConfig actual_config;
-  if (pref_config_tracker_->GetProxyConfig(&actual_config) !=
+  if (pref_config_tracker_->IOGetProxyConfig(&actual_config) !=
           PrefProxyConfigTracker::CONFIG_PRESENT) {
     availability = GetLatestProxyConfig(&actual_config);
     FOR_EACH_OBSERVER(net::ProxyConfigService::Observer, observers_,
                       OnProxyConfigChanged(actual_config, availability));
   }
 }
 
 void PrefProxyConfigService::OnPrefProxyConfigChanged() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
@@ skipping 22 matching lines @@
   }
 }
 
 // static
 void PrefProxyConfigService::RegisterPrefs(PrefService* pref_service) {
   DictionaryValue* default_settings = ProxyConfigDictionary::CreateSystem();
   pref_service->RegisterDictionaryPref(prefs::kProxy,
                                        default_settings,
                                        PrefService::UNSYNCABLE_PREF);
 }