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

chrome/browser/ui/webui/options/chromeos/internet_options_handler.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/ui/webui/options/chromeos/internet_options_handler.h"
 
 #include <ctype.h>
 
 #include <map>
 #include <string>
@@ skipping 532 matching lines @@
 
   if (network->type() != chromeos::TYPE_CELLULAR)
     return;
 
   chromeos::CellularNetwork* cellular =
       static_cast<chromeos::CellularNetwork*>(network);
   if (cellular->activation_state() != chromeos::ACTIVATION_STATE_ACTIVATED)
     cellular->StartActivation();
 }
 
-// Check if the current cellular device can be activated by directly calling
-// it's activate function instead of going through the activation process.
-// Note: Currently Sprint is the only carrier that uses this.
-bool UseDirectActivation() {
-  const chromeos::NetworkDevice* device =
-      chromeos::CrosLibrary::Get()->GetNetworkLibrary()->FindCellularDevice();
-  return device && (device->carrier() == shill::kCarrierSprint);
-}
-
 // Given a list of supported carrier's by the device, return the index of
 // the carrier the device is currently using.
 int FindCurrentCarrierIndex(const base::ListValue* carriers,
                             const chromeos::NetworkDevice* device) {
   DCHECK(carriers);
   DCHECK(device);
 
   bool gsm = (device->technology_family() == chromeos::TECHNOLOGY_FAMILY_GSM);
   int index = 0;
   for (base::ListValue::const_iterator it = carriers->begin();
@@ skipping 382 matching lines @@
   if (network) {
     network->SetApn(chromeos::CellularApn(
         apn, network->apn().network_id, username, password));
   }
 }
 
 void InternetOptionsHandler::CarrierStatusCallback(
     const std::string& service_path,
     chromeos::NetworkMethodErrorType error,
     const std::string& error_message) {
-  if ((error == chromeos::NETWORK_METHOD_ERROR_NONE) &&
-      UseDirectActivation()) {
-    Activate(service_path);
-    UpdateConnectionData(cros_->FindNetworkByPath(service_path));
+  if ((error == chromeos::NETWORK_METHOD_ERROR_NONE)) {
+    chromeos::CellularNetwork* network =
+        cros_->FindCellularNetworkByPath(service_path);
+    if (network && network->UsesDirectActivation()) {
+      Activate(service_path);
+      UpdateConnectionData(network);
+    }
   }
 
   UpdateCarrier();
 }
 
 
 void InternetOptionsHandler::SetCarrierCallback(const ListValue* args) {
   std::string service_path;
   std::string carrier;
   if (args->GetSize() != 2 ||
@@ skipping 669 matching lines @@
   if (command == kTagOptions) {
     cros_->RequestNetworkServiceProperties(
         service_path,
         base::Bind(&InternetOptionsHandler::PopulateDictionaryDetailsCallback,
                    weak_factory_.GetWeakPtr()));
   } else if (command == kTagConnect) {
     ConnectToNetwork(network);
   } else if (command == kTagDisconnect && type != chromeos::TYPE_ETHERNET) {
     cros_->DisconnectFromNetwork(network);
   } else if (command == kTagActivate && type == chromeos::TYPE_CELLULAR) {
-    if (!UseDirectActivation()) {
+    chromeos::CellularNetwork* cellular =
+        static_cast<chromeos::CellularNetwork*>(network);
+    if (!cellular->UsesDirectActivation()) {
       ash::Shell::GetInstance()->delegate()->OpenMobileSetup(
-          network->service_path());
+          cellular->service_path());
     } else {
       Activate(service_path);
       // Update network properties after we start activation. The Activate
       // call is a blocking call, which blocks on finishing the "start" of
       // the activation, hence when we query for network properties after
       // this call is done, we will have the "activating" activation state.
-      UpdateConnectionData(network);
+      UpdateConnectionData(cellular);
     }
   } else {
     VLOG(1) << "Unknown command: " << command;
     NOTREACHED();
   }
 }
 
 void InternetOptionsHandler::ToggleAirplaneModeCallback(const ListValue* args) {
   // TODO(kevers): The use of 'offline_mode' is not quite correct.  Update once
   // we have proper back-end support.
@@ skipping 184 matching lines @@
 
   dictionary->SetBoolean(kTagWimaxEnabled, cros_->wimax_enabled());
   dictionary->SetBoolean(kTagWimaxAvailable, cros_->wimax_available());
   dictionary->SetBoolean(kTagWimaxBusy, cros_->wimax_busy());
   // TODO(kevers): The use of 'offline_mode' is not quite correct.  Update once
   // we have proper back-end support.
   dictionary->SetBoolean(kTagAirplaneMode, cros_->offline_mode());
 }
 
 }  // namespace options