diff options
author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-28 04:42:00 +0000 |
---|---|---|
committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-28 04:42:00 +0000 |
commit | f86b29bb01816ee5b6385348d8ea0c0e6e12b12a (patch) | |
tree | cc021d0bc7ff82819b78469ced2213d56705e2ef /chrome/browser/chromeos/cros/network_library.cc | |
parent | e61a828a38702a00a965683e9e0e13c4bfbdce39 (diff) | |
download | chromium_src-f86b29bb01816ee5b6385348d8ea0c0e6e12b12a.zip chromium_src-f86b29bb01816ee5b6385348d8ea0c0e6e12b12a.tar.gz chromium_src-f86b29bb01816ee5b6385348d8ea0c0e6e12b12a.tar.bz2 |
Remove Cellular data plan UI from Ash
Cashew has been deprecated and Chrome no longer has access to data plan info.
BUG=162964
For ash/, chrome/ resources:
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11421081
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169845 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/cros/network_library.cc')
-rw-r--r-- | chrome/browser/chromeos/cros/network_library.cc | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc index f2f4a8c..4da8fc6 100644 --- a/chrome/browser/chromeos/cros/network_library.cc +++ b/chrome/browser/chromeos/cros/network_library.cc @@ -845,8 +845,7 @@ CellularNetwork::CellularNetwork(const std::string& service_path) activation_state_(ACTIVATION_STATE_UNKNOWN), network_technology_(NETWORK_TECHNOLOGY_UNKNOWN), roaming_state_(ROAMING_STATE_UNKNOWN), - using_post_(false), - data_left_(DATA_UNKNOWN) { + using_post_(false) { } CellularNetwork::~CellularNetwork() { @@ -864,13 +863,6 @@ bool CellularNetwork::StartActivation() { return true; } -void CellularNetwork::RefreshDataPlansIfNeeded() const { - if (!EnsureCrosLoaded()) - return; - if (connected() && activated()) - CrosRequestCellularDataPlanUpdate(service_path()); -} - void CellularNetwork::SetApn(const CellularApn& apn) { if (!apn.apn.empty()) { DictionaryValue value; @@ -887,18 +879,12 @@ void CellularNetwork::SetApn(const CellularApn& apn) { } bool CellularNetwork::SupportsActivation() const { - return SupportsDataPlan(); + return !usage_url().empty() || !payment_url().empty(); } bool CellularNetwork::NeedsActivation() const { return (activation_state() != ACTIVATION_STATE_ACTIVATED && - activation_state() != ACTIVATION_STATE_UNKNOWN) || - needs_new_plan(); -} - -bool CellularNetwork::SupportsDataPlan() const { - // TODO(nkostylev): Are there cases when only one of this is defined? - return !usage_url().empty() || !payment_url().empty(); + activation_state() != ACTIVATION_STATE_UNKNOWN); } GURL CellularNetwork::GetAccountInfoUrl() const { |