Insufficient information on activation details should be handled correctly.

ash/system/chromeos/network/network_connect.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/chromeos/network/network_connect.h"
 
 #include "ash/shell.h"
 #include "ash/system/chromeos/network/network_observer.h"
 #include "ash/system/chromeos/network/network_state_notifier.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ skipping 236 matching lines @@
 namespace network_connect {
 
 void ConnectToNetwork(const std::string& service_path,
                       gfx::NativeWindow owning_window) {
   const bool check_error_state = true;
   CallConnectToNetwork(service_path, check_error_state, owning_window);
 }
 
 void ActivateCellular(const std::string& service_path) {
   NET_LOG_USER("ActivateCellular", service_path);
-  const DeviceState* cellular_device =
-      NetworkHandler::Get()->network_state_handler()->
-      GetDeviceStateByType(flimflam::kTypeCellular);
-  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);
     return;
   }
+  const DeviceState* cellular_device =
+      NetworkHandler::Get()->network_state_handler()->
+      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. 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);

[stevenjb, 2013/08/14 23:19:23]

nit: {} around multi-line statement

[armansito, 2013/08/15 00:35:36]

Oh, this is not a multi-line statement. We show mobile setup if the payment url
is available. We return early either way.

+    return;
+  }
   if (cellular->activation_state() == flimflam::kActivationStateActivated) {
     NET_LOG_ERROR("ActivateCellular for activated service", service_path);
     return;
   }
 
   NetworkHandler::Get()->network_connection_handler()->ActivateNetwork(
       service_path,
       "",  // carrier
       base::Bind(&OnActivateSucceeded, service_path),
       base::Bind(&OnActivateFailed, service_path));
@@ skipping 100 matching lines @@
   if (StringToLowerASCII(error) ==
       StringToLowerASCII(std::string(flimflam::kUnknownString))) {
     return l10n_util::GetStringUTF16(IDS_CHROMEOS_NETWORK_ERROR_UNKNOWN);
   }
   return l10n_util::GetStringFUTF16(IDS_NETWORK_UNRECOGNIZED_ERROR,
                                     UTF8ToUTF16(error));
 }
 
 }  // network_connect
 }  // ash