summaryrefslogtreecommitdiffstats
path: root/chromeos
diff options
context:
space:
mode:
authorarmansito@chromium.org <armansito@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-16 23:34:38 +0000
committerarmansito@chromium.org <armansito@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-16 23:34:38 +0000
commit7476493e677eb8ac679b9eee0cce12b6a5a5b28d (patch)
tree1e0f16dd361e805735b43f119a0a83e601328001 /chromeos
parent0fb06ccf33bdd386f26936dbae396ffe0292882d (diff)
downloadchromium_src-7476493e677eb8ac679b9eee0cce12b6a5a5b28d.zip
chromium_src-7476493e677eb8ac679b9eee0cce12b6a5a5b28d.tar.gz
chromium_src-7476493e677eb8ac679b9eee0cce12b6a5a5b28d.tar.bz2
Add NetworkState::RequiresActivation.
Added a utility function to NetworkState to query if a network requires activation. All UI code should use this instead of comparing the Cellular.ActivationState property themselves, as this utility function handles the "unknown" case as well. BUG=289470 R=stevenjb@chromium.org Review URL: https://codereview.chromium.org/23532065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223472 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
-rw-r--r--chromeos/network/network_connection_handler.cc8
-rw-r--r--chromeos/network/network_state.cc6
-rw-r--r--chromeos/network/network_state.h3
3 files changed, 10 insertions, 7 deletions
diff --git a/chromeos/network/network_connection_handler.cc b/chromeos/network/network_connection_handler.cc
index f5f081f..00776aa 100644
--- a/chromeos/network/network_connection_handler.cc
+++ b/chromeos/network/network_connection_handler.cc
@@ -47,12 +47,6 @@ bool IsAuthenticationError(const std::string& error) {
error == shill::kErrorEapAuthenticationFailed);
}
-bool NetworkRequiresActivation(const NetworkState* network) {
- return (network->type() == flimflam::kTypeCellular &&
- ((network->activation_state() != flimflam::kActivationStateActivated &&
- network->activation_state() != flimflam::kActivationStateUnknown)));
-}
-
bool VPNIsConfigured(const std::string& service_path,
const std::string& provider_type,
const base::DictionaryValue& provider_properties) {
@@ -230,7 +224,7 @@ void NetworkConnectionHandler::ConnectToNetwork(
InvokeErrorCallback(service_path, error_callback, kErrorConnecting);
return;
}
- if (NetworkRequiresActivation(network)) {
+ if (network->RequiresActivation()) {
InvokeErrorCallback(service_path, error_callback,
kErrorActivationRequired);
return;
diff --git a/chromeos/network/network_state.cc b/chromeos/network/network_state.cc
index df42d51..24d194a 100644
--- a/chromeos/network/network_state.cc
+++ b/chromeos/network/network_state.cc
@@ -240,6 +240,12 @@ void NetworkState::GetProperties(base::DictionaryValue* dictionary) const {
cellular_out_of_credits_);
}
+bool NetworkState::RequiresActivation() const {
+ return (type() == flimflam::kTypeCellular &&
+ activation_state() != flimflam::kActivationStateActivated &&
+ activation_state() != flimflam::kActivationStateUnknown);
+}
+
bool NetworkState::IsConnectedState() const {
return StateIsConnected(connection_state_);
}
diff --git a/chromeos/network/network_state.h b/chromeos/network/network_state.h
index 87c9c3c..1a7402d 100644
--- a/chromeos/network/network_state.h
+++ b/chromeos/network/network_state.h
@@ -38,6 +38,9 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState {
// stored.
void GetProperties(base::DictionaryValue* dictionary) const;
+ // Returns true, if the network requires a service activation.
+ bool RequiresActivation() const;
+
// Accessors
const std::string& security() const { return security_; }
const std::string& device_path() const { return device_path_; }