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

chrome/browser/net/pref_proxy_config_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_NET_PREF_PROXY_CONFIG_SERVICE_H_
 #define CHROME_BROWSER_NET_PREF_PROXY_CONFIG_SERVICE_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
@@ skipping 31 matching lines @@
     // Configuration is known to be not set.
     CONFIG_UNSET,
   };
 
   explicit PrefProxyConfigTracker(PrefService* pref_service);
 
   // Observer manipulation is only valid on the IO thread.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
-  // Get the proxy configuration currently defined by preferences. Status is
-  // indicated in the return value. Writes the configuration to |config| unless
-  // the return value is CONFIG_UNSET, in which case |config| is not touched.
-  ConfigState GetProxyConfig(net::ProxyConfig* config);
+  // Get the proxy configuration currently defined by preferences on the IO
+  // and UI threads respectively. Status is indicated in the return value.
+  // Writes the configuration to |config| unless the return value is
+  // CONFIG_UNSET, in which case |config| is not touched.
+  ConfigState IOGetProxyConfig(net::ProxyConfig* config);
+  ConfigState UIGetProxyConfig(net::ProxyConfig* config);
 
   // Notifies the tracker that the pref service passed upon construction is
   // about to go away. This must be called from the UI thread.
   void DetachFromPrefService();
 
  private:
   friend class base::RefCountedThreadSafe<PrefProxyConfigTracker>;
   virtual ~PrefProxyConfigTracker();
 
   // NotificationObserver implementation:
@@ skipping 11 matching lines @@
   // Creates a proxy configuration from proxy-related preferences. Configuration
   // is stored in |config| and the return value indicates whether the
   // configuration is valid.
   ConfigState ReadPrefConfig(net::ProxyConfig* config);
 
   // Converts a ProxyConfigDictionary to net::ProxyConfig representation.
   // Returns true if the data from in the dictionary is valid, false otherwise.
   static bool PrefConfigToNetConfig(const ProxyConfigDictionary& proxy_dict,
                                     net::ProxyConfig* config);
 
+  // Configuration as defined by prefs. Only to be accessed from the UI thread.
+  net::ProxyConfig ui_pref_config_;
+
+  // Tracks configuration state. |ui_pref_config_| is valid only if
+  // |ui_config_state_| is not CONFIG_UNSET.
+  ConfigState ui_config_state_;
+
   // Configuration as defined by prefs. Only to be accessed from the IO thread
   // (except for construction).
-  net::ProxyConfig pref_config_;
+  net::ProxyConfig io_pref_config_;
 
-  // Tracks configuration state. |pref_config_| is valid only if |config_state_|
-  // is not CONFIG_UNSET.
-  ConfigState config_state_;
+  // Tracks configuration state. |io_pref_config_| is valid only if
+  // |io_config_state_| is not CONFIG_UNSET.
+  ConfigState io_config_state_;
 
   // List of observers, accessed exclusively from the IO thread.
   ObserverList<Observer, true> observers_;
 
   // Pref-related members that should only be accessed from the UI thread.
   PrefService* pref_service_;
   scoped_ptr<PrefSetObserver> proxy_prefs_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefProxyConfigTracker);
 };
@@ skipping 35 matching lines @@
   ObserverList<net::ProxyConfigService::Observer, true> observers_;
   scoped_refptr<PrefProxyConfigTracker> pref_config_tracker_;
 
   // Indicates whether the base service and tracker registrations are done.
   bool registered_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefProxyConfigService);
 };
 
 #endif  // CHROME_BROWSER_NET_PREF_PROXY_CONFIG_SERVICE_H_