diff options
| author | armansito@chromium.org <armansito@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-15 07:19:48 +0000 |
|---|---|---|
| committer | armansito@chromium.org <armansito@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-15 07:19:48 +0000 |
| commit | c8dd69b59f34f6c0b935e70f1653cfd737507336 (patch) | |
| tree | 99a438a7a253c192ecefac417958659628ebedb3 /chromeos/network | |
| parent | f500341633a4c5e0eee8ce21320d9d559ef8daf9 (diff) | |
| download | chromium_src-c8dd69b59f34f6c0b935e70f1653cfd737507336.zip chromium_src-c8dd69b59f34f6c0b935e70f1653cfd737507336.tar.gz chromium_src-c8dd69b59f34f6c0b935e70f1653cfd737507336.tar.bz2 | |
Insufficient information on activation details should be handled correctly.
This CL makes the following two changes for the case where the service property
"Cellular.ActivationState" has value "flimflam::kActivationStateUnknown" and
payment portal URL is unavailable:
1. NetworkConnectionHandler won't fail to connect with an activation error.
2. InternetOptionsHandler will hide the "View Account" and "Activate" buttons
if a payment portal URL is unavailable.
This CL also removes the NetworkConnectionHandler behavior that causes
a connect operation to fail with an activation related error when
Cellular.OutOfCredits is set to true, which leads to a confusing user
experience.
BUG=272324
Review URL: https://chromiumcodereview.appspot.com/22950007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217759 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/network')
| -rw-r--r-- | chromeos/network/network_connection_handler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromeos/network/network_connection_handler.cc b/chromeos/network/network_connection_handler.cc index afbd741..0348987 100644 --- a/chromeos/network/network_connection_handler.cc +++ b/chromeos/network/network_connection_handler.cc @@ -57,8 +57,8 @@ void CopyStringFromDictionary(const base::DictionaryValue& source, bool NetworkRequiresActivation(const NetworkState* network) { return (network->type() == flimflam::kTypeCellular && - (network->activation_state() != flimflam::kActivationStateActivated || - network->cellular_out_of_credits())); + ((network->activation_state() != flimflam::kActivationStateActivated && + network->activation_state() != flimflam::kActivationStateUnknown))); } bool VPNIsConfigured(const std::string& service_path, |