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 453 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 = callbacks_.begin();
+  for (;iter != callbacks_.end(); ++iter) {

[kuan, 2011/11/10 14:27:25]

s/;iter/; iter/

[pastarmovj, 2011/11/10 16:08:26]

Done.

+    if (callback.Equals(*iter)) {
+      return;
+    }

[kuan, 2011/11/10 14:27:25]

don't need curly braces

[pastarmovj, 2011/11/10 16:08:26]

Done.

+  }
+  callbacks_.push_back(callback);
+}
+
+void ProxyConfigServiceImpl::RemoveNotificationCallback(
+    base::Closure callback) {
+  std::vector<base::Closure>::iterator iter = callbacks_.begin();
+  for (;iter != callbacks_.end(); ++iter) {

[kuan, 2011/11/10 14:27:25]

s/;iter/; iter/

[pastarmovj, 2011/11/10 16:08:26]

Done.

+    if (callback.Equals(*iter)) {
+      callbacks_.erase(iter);
+      return;
+    }
+  }
+}
+
 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++;

[kuan, 2011/11/10 14:27:25]

pre-increment

[pastarmovj, 2011/11/10 16:08:26]

Done.

+    }
+  }
 }
 
 void ProxyConfigServiceImpl::ResetUICache() {
   current_ui_network_.clear();
   current_ui_config_ = ProxyConfig();
 }
 
 }  // namespace chromeos