Refactor proxy handling for ChromeOS to not go through the CrosSettings interface.

The ProxyCrosSettingsProvider was not a real SignedSettings handler since the
network manager was introduced and was only used to parse the data for the UI.
However this does not go well with the unification of the SignedSettings
handling and belongs to the presentation layer. Therefore we extract the
parsing functionality in a helper class and move some of the logic up the
UI handling layer.

BUG=chromium-os:14054
TEST=Proxy UI should still be working (automation tests).

Review URL: http://codereview.chromium.org/8467012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109886 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 4 deletions

diff --git a/chrome/browser/chromeos/proxy_config_service_impl.h b/chrome/browser/chromeos/proxy_config_service_impl.h
index dc25618..b059080 100644
--- a/chrome/browser/chromeos/proxy_config_service_impl.h
+++ b/chrome/browser/chromeos/proxy_config_service_impl.h
@@ -182,6 +182,15 @@ class ProxyConfigServiceImpl
   // Only valid for MODE_SINGLE_PROXY or MODE_PROXY_PER_SCHEME.
   bool UISetProxyConfigBypassRules(const net::ProxyBypassRules& bypass_rules);
 
+  // Add/Remove callback functions for notification when network to be viewed is
+  // changed by the UI.
+  void AddNotificationCallback(base::Closure callback);
+  void RemoveNotificationCallback(base::Closure callback);
+
+  // PrefProxyConfigTrackerImpl implementation.
+  virtual void OnProxyConfigChanged(ProxyPrefs::ConfigState config_state,
+                                    const net::ProxyConfig& config) OVERRIDE;
+
   // Implementation for SignedSettings::Delegate
   virtual void OnSettingsOpCompleted(SignedSettings::ReturnCode code,
                                      std::string value) OVERRIDE;
@@ -193,10 +202,6 @@ class ProxyConfigServiceImpl
   virtual void OnNetworkChanged(NetworkLibrary* cros,
                                 const Network* network) OVERRIDE;
 
-  // PrefProxyConfigTrackerImpl implementation.
-  virtual void OnProxyConfigChanged(ProxyPrefs::ConfigState config_state,
-                                    const net::ProxyConfig& config) OVERRIDE;
-
   // Register UseShardProxies preference.
   static void RegisterPrefs(PrefService* pref_service);
 
@@ -293,6 +298,10 @@ class ProxyConfigServiceImpl
   // Operation to retrieve proxy setting from device.
   scoped_refptr<SignedSettings> retrieve_property_op_;
 
+  // Callbacks for notification when network to be viewed has been changed from
+  // the UI.
+  std::vector<base::Closure> callbacks_;
+
   DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceImpl);
 };