Enable Verizon Activation from OOBE/Login screen.

chrome/browser/chromeos/status/network_menu.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/status/network_menu.h"
 
 #include <algorithm>
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
@@ skipping 46 matching lines @@
   while (found != std::string::npos) {
     str.replace(found, 1, "&&");
     found = str.find('&', found + 2);
   }
   return str;
 }
 
 // Activate a cellular network.
 void ActivateCellular(const chromeos::CellularNetwork* cellular) {
   DCHECK(cellular);
-  if (!chromeos::UserManager::Get()->IsSessionStarted())
-    return;
 
   ash::Shell::GetInstance()->delegate()->OpenMobileSetup(
       cellular->service_path());
 }
 
 // Decides whether a network should be highlighted in the UI.
 bool ShouldHighlightNetwork(const chromeos::Network* network) {
   chromeos::NetworkLibrary* cros =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   return cros->connected_network() ? network == cros->connected_network() :
@@ skipping 504 matching lines @@
   if (cellular_available && cellular_enabled) {
     const CellularNetworkVector& cell_networks = cros->cellular_networks();
     const CellularNetwork* active_cellular = cros->cellular_network();
 
     bool separator_added = false;
     // List Cellular networks.
     for (size_t i = 0; i < cell_networks.size(); ++i) {
       chromeos::ActivationState activation_state =
           cell_networks[i]->activation_state();
 
-      // This is currently only used in the OOBE/login screen, do not show
-      // activating 3G option.
-      if (activation_state != ACTIVATION_STATE_ACTIVATED)
-        continue;
-
       // Ampersand is a valid character in a network name, but menu2 uses it
       // to mark "mnemonics" for keyboard shortcuts.  http://crosbug.com/14697
       std::string network_name = EscapeAmpersands(cell_networks[i]->name());
       if (activation_state == ACTIVATION_STATE_NOT_ACTIVATED ||
           activation_state == ACTIVATION_STATE_PARTIALLY_ACTIVATED) {
         label = l10n_util::GetStringFUTF16(
             IDS_STATUSBAR_NETWORK_DEVICE_ACTIVATE,
             UTF8ToUTF16(network_name));
       } else if (activation_state == ACTIVATION_STATE_ACTIVATING) {
         label = l10n_util::GetStringFUTF16(
@@ skipping 368 matching lines @@
   } else if (network->type() == TYPE_WIMAX) {
     WimaxNetwork* wimax = static_cast<WimaxNetwork*>(network);
     if (wimax->passphrase_required()) {
       // Show the connection UI if we require a passphrase.
       NetworkConfigView::Show(wimax, delegate()->GetNativeWindow());
     } else {
       cros->ConnectToWimaxNetwork(wimax);
       // Connection failures are responsible for updating the UI, including
       // reopening dialogs.
     }
+  } else if (network->type() == TYPE_CELLULAR) {
+    CellularNetwork* cellular = static_cast<CellularNetwork*>(network);
+    if (cellular->activation_state() != ACTIVATION_STATE_ACTIVATED) {
+      ActivateCellular(cellular);
+    } else {
+      cros->ConnectToCellularNetwork(cellular);
+    }
   }
 }
 
 void NetworkMenu::ConnectToNetwork(Network* network) {
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   switch (network->type()) {
     case TYPE_ETHERNET: {
       ShowTabbedNetworkSettings(network);
       break;
     }
@@ skipping 101 matching lines @@
 
 void NetworkMenu::ShowOtherWifi() {
   NetworkConfigView::ShowForType(TYPE_WIFI, delegate_->GetNativeWindow());
 }
 
 void NetworkMenu::ShowOtherCellular() {
   ChooseMobileNetworkDialog::ShowDialog(delegate_->GetNativeWindow());
 }
 
 }  // namespace chromeos