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

1 files changed, 13 insertions, 11 deletions

diff --git a/ash/system/chromeos/network/network_connect.cc b/ash/system/chromeos/network/network_connect.cc
index 3aca162..688c910 100644
--- a/ash/system/chromeos/network/network_connect.cc
+++ b/ash/system/chromeos/network/network_connect.cc
@@ -254,25 +254,27 @@ void ConnectToNetwork(const std::string& service_path,
 
 void ActivateCellular(const std::string& service_path) {
   NET_LOG_USER("ActivateCellular", service_path);
+  const NetworkState* cellular =
+      NetworkHandler::Get()->network_state_handler()->
+      GetNetworkState(service_path);
+  if (!cellular || cellular->type() != flimflam::kTypeCellular) {
+    NET_LOG_ERROR("ActivateCellular with no Service", service_path);
+    return;
+  }
   const DeviceState* cellular_device =
       NetworkHandler::Get()->network_state_handler()->
-      GetDeviceStateByType(flimflam::kTypeCellular);
+      GetDeviceState(cellular->device_path());
   if (!cellular_device) {
     NET_LOG_ERROR("ActivateCellular with no Device", service_path);
     return;
   }
   if (!IsDirectActivatedCarrier(cellular_device->carrier())) {
     // For non direct activation, show the mobile setup dialog which can be
-    // used to activate the network.
-    ash::Shell::GetInstance()->system_tray_delegate()->ShowMobileSetup(
-        service_path);
-    return;
-  }
-  const NetworkState* cellular =
-      NetworkHandler::Get()->network_state_handler()->
-      GetNetworkState(service_path);
-  if (!cellular || cellular->type() != flimflam::kTypeCellular) {
-    NET_LOG_ERROR("ActivateCellular with no Service", service_path);
+    // used to activate the network. Only show the dialog, if an account
+    // management URL is available.
+    if (!cellular->payment_url().empty())
+      ash::Shell::GetInstance()->system_tray_delegate()->ShowMobileSetup(
+          service_path);
     return;
   }
   if (cellular->activation_state() == flimflam::kActivationStateActivated) {