Unify ActivateCellular into network_connect.cc

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 515 matching lines @@
   hostname_ui_data.ParseOncProperty(
       vpn->ui_data().onc_source(), &onc,
       base::StringPrintf("%s.%s",
                          chromeos::onc::network_config::kVPN,
                          chromeos::onc::vpn::kHost));
   SetValueDictionary(dictionary, kTagServerHostname,
                      new base::StringValue(vpn->server_hostname()),
                      hostname_ui_data);
 }
 
-// Activate the cellular device pointed to by the service path.
-void Activate(std::string service_path) {
-  chromeos::Network* network = NULL;
-  if (!service_path.empty()) {
-    network = chromeos::CrosLibrary::Get()->GetNetworkLibrary()->
-        FindNetworkByPath(service_path);
-  } else {
-    NOTREACHED();
-    return;
-  }
-
-  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();
-}
-
 // 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 350 matching lines @@
 
 void InternetOptionsHandler::ShowMorePlanInfoCallback(const ListValue* args) {
   if (!web_ui())
     return;
 
   std::string service_path;
   if (args->GetSize() != 1 || !args->GetString(0, &service_path)) {
     NOTREACHED();
     return;
   }
-
-  const chromeos::CellularNetwork* cellular =
-      cros_->FindCellularNetworkByPath(service_path);
-  if (!cellular)
-    return;
-  ash::Shell::GetInstance()->delegate()->OpenMobileSetup(service_path);
+  chromeos::network_connect::ShowMobileSetup(service_path);
 }
 
 void InternetOptionsHandler::BuyDataPlanCallback(const ListValue* args) {
   if (!web_ui())
     return;
 
   std::string service_path;
   if (args->GetSize() != 1 || !args->GetString(0, &service_path)) {
     NOTREACHED();
     return;
   }
-  ash::Shell::GetInstance()->delegate()->OpenMobileSetup(service_path);
+  chromeos::network_connect::ShowMobileSetup(service_path);
 }
 
 void InternetOptionsHandler::SetApnCallback(const ListValue* args) {
   std::string service_path;
   std::string apn;
   std::string username;
   std::string password;
   if (args->GetSize() != 4 ||
       !args->GetString(0, &service_path) ||
       !args->GetString(1, &apn) ||
@@ skipping 10 matching lines @@
         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) &&
       cros_->CellularDeviceUsesDirectActivation()) {
-    Activate(service_path);
+    chromeos::network_connect::ActivateCellular(service_path);
     UpdateConnectionData(cros_->FindNetworkByPath(service_path));
   }
 
   UpdateCarrier();
 }
 
 
 void InternetOptionsHandler::SetCarrierCallback(const ListValue* args) {
   std::string service_path;
   std::string carrier;
@@ skipping 675 matching lines @@
     cros_->RequestNetworkServiceProperties(
         service_path,
         base::Bind(&InternetOptionsHandler::PopulateDictionaryDetailsCallback,
                    weak_factory_.GetWeakPtr()));
   } else if (command == kTagConnect) {
     chromeos::network_connect::ConnectToNetwork(
         service_path, GetNativeWindow());
   } else if (command == kTagDisconnect && type != chromeos::TYPE_ETHERNET) {
     cros_->DisconnectFromNetwork(network);
   } else if (command == kTagActivate && type == chromeos::TYPE_CELLULAR) {
-    if (!cros_->CellularDeviceUsesDirectActivation()) {
-      ash::Shell::GetInstance()->delegate()->OpenMobileSetup(
-          network->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);
-    }
+    chromeos::network_connect::ActivateCellular(service_path);
+    // Activation may update network properties (e.g. ActivationState), so
+    // request them here in case they change.
+    UpdateConnectionData(network);
   } 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.
   cros_->EnableOfflineMode(!cros_->offline_mode());
@@ skipping 131 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