Add connection type to NCN::MaxBandwidthChanged

chromeos/network/network_change_notifier_chromeos.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/strings/string_util.h"
@@ skipping 84 matching lines @@
   // Re-evaluate connection state if we are offline since there is little
   // cost to doing so.  Since we are in the context of a const method,
   // this is done through a closure that holds a non-const reference to
   // |this|, to allow PollForState() to modify our cached state.
   // TODO(gauravsh): Figure out why we would have missed this notification.
   if (connection_type_ == CONNECTION_NONE)
     task_runner_->PostTask(FROM_HERE, poll_callback_);
   return connection_type_;
 }
 
-double NetworkChangeNotifierChromeos::GetCurrentMaxBandwidth() const {
-  return max_bandwidth_mbps_;
+void NetworkChangeNotifierChromeos::GetCurrentMaxBandwidthAndConnectionType(
+    double* max_bandwidth_mbps,
+    ConnectionType* connection_type) const {
+  *connection_type = connection_type_;
+  *max_bandwidth_mbps = max_bandwidth_mbps_;
 }
 
 void NetworkChangeNotifierChromeos::SuspendDone(
     const base::TimeDelta& sleep_duration) {
   // Force invalidation of network resources on resume.
   NetworkChangeNotifier::NotifyObserversOfIPAddressChange();
 }
 
 
 void NetworkChangeNotifierChromeos::DefaultNetworkChanged(
     const chromeos::NetworkState* default_network) {
   bool connection_type_changed = false;
   bool ip_address_changed = false;
   bool dns_changed = false;
   bool max_bandwidth_changed = false;
 
   UpdateState(default_network, &connection_type_changed, &ip_address_changed,
               &dns_changed, &max_bandwidth_changed);
 
   if (connection_type_changed)
     NetworkChangeNotifier::NotifyObserversOfConnectionTypeChange();
   if (ip_address_changed)
     NetworkChangeNotifier::NotifyObserversOfIPAddressChange();
   if (dns_changed)
     dns_config_service_->OnNetworkChange();
-  if (max_bandwidth_changed)
+  if (max_bandwidth_changed || connection_type_changed) {
     NetworkChangeNotifier::NotifyObserversOfMaxBandwidthChange(
-        max_bandwidth_mbps_);
+        max_bandwidth_mbps_, connection_type_);
+  }
 }
 
 void NetworkChangeNotifierChromeos::UpdateState(
     const chromeos::NetworkState* default_network,
     bool* connection_type_changed,
     bool* ip_address_changed,
     bool* dns_changed,
     bool* max_bandwidth_changed) {
   *connection_type_changed = false;
   *ip_address_changed = false;
@@ skipping 154 matching lines @@
   // produce a single signal when switching between network connections.
   params.ip_address_offline_delay_ = base::TimeDelta::FromMilliseconds(4000);
   params.ip_address_online_delay_ = base::TimeDelta::FromMilliseconds(1000);
   params.connection_type_offline_delay_ =
       base::TimeDelta::FromMilliseconds(500);
   params.connection_type_online_delay_ = base::TimeDelta::FromMilliseconds(500);
   return params;
 }
 
 }  // namespace chromeos