Revert 63135 - Update icons to show lowdata and very lowdata for 3G data....

chrome/browser/chromeos/cros/network_library.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_
 #define CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/observer_list.h"
 #include "base/platform_thread.h"
 #include "base/singleton.h"
 #include "base/timer.h"
 #include "cros/chromeos_network.h"
 
 namespace chromeos {
 
-// Cellular network is considered low data when less than 60 minues.
-static const int kCellularDataLowSecs = 60 * 60;
-
-// Cellular network is considered low data when less than 30 minues.
-static const int kCellularDataVeryLowSecs = 30 * 60;
-
-// Cellular network is considered low data when less than 100MB.
-static const int kCellularDataLowBytes = 100 * 1024 * 1024;
-
-// Cellular network is considered very low data when less than 50MB.
-static const int kCellularDataVeryLowBytes = 50 * 1024 * 1024;
-
 class Network {
  public:
   const std::string& service_path() const { return service_path_; }
   const std::string& device_path() const { return device_path_; }
   const std::string& ip_address() const { return ip_address_; }
   ConnectionType type() const { return type_; }
   ConnectionState connection_state() const { return state_; }
   bool connecting() const { return state_ == STATE_ASSOCIATION ||
       state_ == STATE_CONFIGURATION || state_ == STATE_CARRIER; }
   bool connected() const { return state_ == STATE_READY; }
@@ skipping 81 matching lines @@
         favorite_(false) {}
 
   std::string name_;
   int strength_;
   bool auto_connect_;
   bool favorite_;
 };
 
 class CellularNetwork : public WirelessNetwork {
  public:
-  enum DataLeft {
-    DATA_NORMAL,
-    DATA_LOW,
-    DATA_VERY_LOW,
-    DATA_NONE
-  };
-
   CellularNetwork();
   explicit CellularNetwork(const ServiceInfo& service)
       : WirelessNetwork() {
     ConfigureFromService(service);
   }
 
   // Starts device activation process. Returns false if the device state does
   // not permit activation.
   bool StartActivation() const;
   const ActivationState activation_state() const { return activation_state_; }
@@ skipping 12 matching lines @@
   const std::string& esn() const { return esn_; }
   const std::string& mdn() const { return mdn_; }
   const std::string& min() const { return min_; }
   const std::string& model_id() const { return model_id_; }
   const std::string& manufacturer() const { return manufacturer_; }
   const std::string& firmware_revision() const { return firmware_revision_; }
   const std::string& hardware_revision() const { return hardware_revision_; }
   const std::string& last_update() const { return last_update_; }
   const unsigned int prl_version() const { return prl_version_; }
   bool is_gsm() const;
-  DataLeft data_left() const;
 
   // WirelessNetwork overrides.
   virtual void Clear();
   virtual void ConfigureFromService(const ServiceInfo& service);
 
   const CellularDataPlanList& GetDataPlans() const {
     return data_plans_;
   }
 
-  void SetDataPlans(const CellularDataPlanList& data_plans) {
+  void SetDataPlans(CellularDataPlanList& data_plans) {
     data_plans_ = data_plans;
   }
   // Return a string representation of network technology.
   std::string GetNetworkTechnologyString() const;
   // Return a string representation of activation state.
   std::string GetActivationStateString() const;
   // Return a string representation of roaming state.
   std::string GetRoamingStateString() const;
 
  protected:
@@ skipping 123 matching lines @@
 // This class handles the interaction with the ChromeOS network library APIs.
 // Classes can add themselves as observers. Users can get an instance of the
 // library like this: chromeos::CrosLibrary::Get()->GetNetworkLibrary()
 class NetworkLibrary {
  public:
   class Observer {
    public:
     // Called when the network has changed. (wifi networks, and ethernet)
     virtual void NetworkChanged(NetworkLibrary* obj) = 0;
     // Called when the cellular data plan has changed.
-    virtual void CellularDataPlanChanged(NetworkLibrary* obj) {}
+    virtual void CellularDataPlanChanged(const std::string& service_path,
+                                         const CellularDataPlanList& plans) {}
   };
 
   virtual ~NetworkLibrary() {}
   virtual void AddObserver(Observer* observer) = 0;
   virtual void RemoveObserver(Observer* observer) = 0;
 
   // Return the active Ethernet network (or a default structure if inactive).
   virtual const EthernetNetwork& ethernet_network() const = 0;
   virtual bool ethernet_connecting() const = 0;
   virtual bool ethernet_connected() const = 0;
@@ skipping 63 matching lines @@
                                     const std::string& password,
                                     const std::string& identity,
                                     const std::string& certpath,
                                     bool auto_connect) = 0;
 
   // Connect to the specified cellular network.
   virtual void ConnectToCellularNetwork(CellularNetwork network) = 0;
 
   // Initiates cellular data plan refresh. Plan data will be passed through
   // Network::Observer::CellularDataPlanChanged callback.
-  virtual void RefreshCellularDataPlans(const CellularNetwork& network) = 0;
+  virtual void RefreshCellularDataPlans(
+      const CellularNetwork& network) = 0;
 
   // Disconnect from the specified wireless (either cellular or wifi) network.
   virtual void DisconnectFromWirelessNetwork(
       const WirelessNetwork& network) = 0;
 
   // Save network information including passwords (wifi) and auto-connect.
   virtual void SaveCellularNetwork(const CellularNetwork& network) = 0;
   virtual void SaveWifiNetwork(const WifiNetwork& network) = 0;
 
   // Forget the passed in wireless (either cellular or wifi) network.
@@ skipping 30 matching lines @@
   virtual std::string GetHtmlInfo(int refresh) = 0;
 
   // Factory function, creates a new instance and returns ownership.
   // For normal usage, access the singleton via CrosLibrary::Get().
   static NetworkLibrary* GetImpl(bool stub);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_