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

chrome/browser/chromeos/proxy_config_service_impl.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/chromeos/proxy_config_service_impl.h"
 
 #include <ostream>
 
 #include "base/json/json_value_serializer.h"
 #include "base/logging.h"
@@ skipping 11 matching lines @@
 #include "content/public/browser/notification_service.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace em = enterprise_management;
 
 namespace chromeos {
 
 namespace {
 
+// Shoud we try to push this to base?
+// Helper comparator functor for the find_if call in |findIfEqual|
+template <class T>
+class EqualsComparator{
+ public:
+  explicit EqualsComparator(const T& key) : key_(key) { }
+  bool operator() (const T& element) {
+    return element.Equals(key_);
+  }
+ private:
+  const T& key_;
+};
+
+// Tiny stl helper function to allow using the find_if syntax on objects that

[Mattias Nissler (ping if slow), 2011/11/14 08:35:45]

s/stl/STL/

[pastarmovj, 2011/11/14 14:20:34]

Done.

+// doesn't use the == operator but implement the Equals function which is the

[Mattias Nissler (ping if slow), 2011/11/14 08:35:45]

s/the == operator/operator==/

[pastarmovj, 2011/11/14 14:20:34]

Done.

+// quasi standard with the coding style we have.
+template<class InputIterator, class T>
+InputIterator findIfEqual(InputIterator first, InputIterator last,
+                         const T& key) {

[Mattias Nissler (ping if slow), 2011/11/14 08:35:45]

indentation

[pastarmovj, 2011/11/14 14:20:34]

Done.

+  return std::find_if(first, last, EqualsComparator<T>(key));
+}
+
 const char* ModeToString(ProxyConfigServiceImpl::ProxyConfig::Mode mode) {
   switch (mode) {
     case ProxyConfigServiceImpl::ProxyConfig::MODE_DIRECT:
       return "direct";
     case ProxyConfigServiceImpl::ProxyConfig::MODE_AUTO_DETECT:
       return "auto-detect";
     case ProxyConfigServiceImpl::ProxyConfig::MODE_PAC_SCRIPT:
       return "pacurl";
     case ProxyConfigServiceImpl::ProxyConfig::MODE_SINGLE_PROXY:
       return "single-proxy";
@@ skipping 422 matching lines @@
     NOTREACHED();
     VLOG(1) << "Cannot set bypass rules for proxy mode ["
              << current_ui_config_.mode << "]";
     return false;
   }
   current_ui_config_.bypass_rules = bypass_rules;
   OnUISetProxyConfig();
   return true;
 }
 
+void ProxyConfigServiceImpl::AddNotificationCallback(base::Closure callback) {
+
+  std::vector<base::Closure>::iterator iter =
+      findIfEqual(callbacks_.begin(), callbacks_.end(), callback);
+  if (iter == callbacks_.end())
+    callbacks_.push_back(callback);
+}
+
+void ProxyConfigServiceImpl::RemoveNotificationCallback(
+    base::Closure callback) {
+  std::vector<base::Closure>::iterator iter =
+      findIfEqual(callbacks_.begin(), callbacks_.end(), callback);
+  if (iter != callbacks_.end())
+    callbacks_.erase(iter);
+}
+
 void ProxyConfigServiceImpl::OnProxyConfigChanged(
     ProxyPrefs::ConfigState config_state,
     const net::ProxyConfig& config) {
   VLOG(1) << this << ": got prefs change: " << ConfigStateToString(config_state)
           << ", mode=" << config.proxy_rules().type;
   Network* network = NULL;
   if (!active_network_.empty()) {
     network = CrosLibrary::Get()->GetNetworkLibrary()->FindNetworkByPath(
         active_network_);
     if (!network)
@@ skipping 271 matching lines @@
 }
 
 void ProxyConfigServiceImpl::OnUISetCurrentNetwork(const Network* network) {
   DetermineEffectiveConfig(network, false);
   VLOG(1) << this << ": current ui network: "
                   << (network->name().empty() ?
                       current_ui_network_ : network->name())
                   << ", " << ModeToString(current_ui_config_.mode)
                   << ", " << ConfigStateToString(current_ui_config_.state)
                   << ", modifiable:" << current_ui_config_.user_modifiable;
+  // Notify whoever is interested in this change.
+  std::vector<base::Closure>::iterator iter = callbacks_.begin();
+  while (iter != callbacks_.end()) {
+    if (iter->is_null()) {
+      iter = callbacks_.erase(iter);
+    } else {
+      iter->Run();
+      ++iter;
+    }
+  }
 }
 
 void ProxyConfigServiceImpl::ResetUICache() {
   current_ui_network_.clear();
   current_ui_config_ = ProxyConfig();
 }
 
 }  // namespace chromeos