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

[Mattias Nissler (ping if slow), 2011/11/11 12:10:46]

std::find

[pastarmovj, 2011/11/11 15:17:31]

After spending an hour playing with templates and traits I came up with the
solution you see in the new version. WDYT?

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

[Mattias Nissler (ping if slow), 2011/11/11 12:10:46]

std::find

[pastarmovj, 2011/11/11 15:17:31]

Ditto.

+}
+
 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);

[Mattias Nissler (ping if slow), 2011/11/11 12:10:46]

You can't do that while still iterating.

[pastarmovj, 2011/11/11 15:17:31]

All other iterators are invalidated true but the iterator returned by erase is
the one pointing to the next element after the erased one in the updated vector
(possibly one pointing to end()) so we can safely resume from it.

+    } else {
+      iter->Run();
+      ++iter;
+    }
+  }
 }
 
 void ProxyConfigServiceImpl::ResetUICache() {
   current_ui_network_.clear();
   current_ui_config_ = ProxyConfig();
 }
 
 }  // namespace chromeos