Don't open mobile setup when activating Sprint network from network menu

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 @@
   std::string str = input;
   size_t found = str.find('&');
   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) {
+void ActivateCellular(chromeos::CellularNetwork* cellular) {
   DCHECK(cellular);
 
-  ash::Shell::GetInstance()->delegate()->OpenMobileSetup(
-      cellular->service_path());
+  if (cellular->UsesDirectActivation()) {
+    cellular->StartActivation();
+  } else {
+    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() :
                                      network == cros->connecting_network();
 }
 
@@ skipping 1024 matching lines @@
 
 void NetworkMenu::ShowOtherVPN() {
   NetworkConfigView::ShowForType(TYPE_VPN, delegate_->GetNativeWindow());
 }
 
 void NetworkMenu::ShowOtherCellular() {
   ChooseMobileNetworkDialog::ShowDialog(delegate_->GetNativeWindow());
 }
 
 }  // namespace chromeos