| Index: chrome/browser/chromeos/cros/network_library.h
|
| ===================================================================
|
| --- chrome/browser/chromeos/cros/network_library.h (revision 63144)
|
| +++ chrome/browser/chromeos/cros/network_library.h (working copy)
|
| @@ -17,18 +17,6 @@
|
|
|
| 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_; }
|
| @@ -130,13 +118,6 @@
|
|
|
| class CellularNetwork : public WirelessNetwork {
|
| public:
|
| - enum DataLeft {
|
| - DATA_NORMAL,
|
| - DATA_LOW,
|
| - DATA_VERY_LOW,
|
| - DATA_NONE
|
| - };
|
| -
|
| CellularNetwork();
|
| explicit CellularNetwork(const ServiceInfo& service)
|
| : WirelessNetwork() {
|
| @@ -169,7 +150,6 @@
|
| 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();
|
| @@ -179,7 +159,7 @@
|
| 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.
|
| @@ -323,7 +303,8 @@
|
| // 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() {}
|
| @@ -407,7 +388,8 @@
|
|
|
| // 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(
|
|
|