OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_ |
6 #define CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_ | 6 #define CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
609 return activation_state() == ACTIVATION_STATE_ACTIVATED; | 609 return activation_state() == ACTIVATION_STATE_ACTIVATED; |
610 } | 610 } |
611 const NetworkTechnology network_technology() const { | 611 const NetworkTechnology network_technology() const { |
612 return network_technology_; | 612 return network_technology_; |
613 } | 613 } |
614 const NetworkRoamingState roaming_state() const { return roaming_state_; } | 614 const NetworkRoamingState roaming_state() const { return roaming_state_; } |
615 bool restricted_pool() const { | 615 bool restricted_pool() const { |
616 return state_ == STATE_PORTAL; | 616 return state_ == STATE_PORTAL; |
617 } | 617 } |
618 bool needs_new_plan() const { | 618 bool needs_new_plan() const { |
619 return restricted_pool() && connected() && activated(); | 619 return SupportsDataPlan() && restricted_pool() |
| 620 && connected() && activated(); |
620 } | 621 } |
621 const std::string& operator_name() const { return operator_name_; } | 622 const std::string& operator_name() const { return operator_name_; } |
622 const std::string& operator_code() const { return operator_code_; } | 623 const std::string& operator_code() const { return operator_code_; } |
623 const std::string& operator_country() const { return operator_country_; } | 624 const std::string& operator_country() const { return operator_country_; } |
624 const std::string& payment_url() const { return payment_url_; } | 625 const std::string& payment_url() const { return payment_url_; } |
625 const std::string& usage_url() const { return usage_url_; } | 626 const std::string& usage_url() const { return usage_url_; } |
626 DataLeft data_left() const { return data_left_; } | 627 DataLeft data_left() const { return data_left_; } |
627 const Apn& apn() const { return apn_; } | 628 const Apn& apn() const { return apn_; } |
628 const Apn& last_good_apn() const { return last_good_apn_; } | 629 const Apn& last_good_apn() const { return last_good_apn_; } |
629 void SetApn(const Apn& apn); | 630 void SetApn(const Apn& apn); |
(...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1228 virtual void SetIPConfig(const NetworkIPConfig& ipconfig) = 0; | 1229 virtual void SetIPConfig(const NetworkIPConfig& ipconfig) = 0; |
1229 | 1230 |
1230 // Factory function, creates a new instance and returns ownership. | 1231 // Factory function, creates a new instance and returns ownership. |
1231 // For normal usage, access the singleton via CrosLibrary::Get(). | 1232 // For normal usage, access the singleton via CrosLibrary::Get(). |
1232 static NetworkLibrary* GetImpl(bool stub); | 1233 static NetworkLibrary* GetImpl(bool stub); |
1233 }; | 1234 }; |
1234 | 1235 |
1235 } // namespace chromeos | 1236 } // namespace chromeos |
1236 | 1237 |
1237 #endif // CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_ | 1238 #endif // CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_ |
OLD | NEW |