Convert all connect code to use NetworkHandler instead of NetworkLibrary

chrome/browser/chromeos/system/ash_system_tray_delegate.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/system/ash_system_tray_delegate.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 472 matching lines @@
   virtual void ShowDateSettings() OVERRIDE {
     content::RecordAction(content::UserMetricsAction("ShowDateOptions"));
     std::string sub_page = std::string(chrome::kSearchSubPage) + "#" +
         l10n_util::GetStringUTF8(IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME);
     chrome::ShowSettingsSubPage(GetAppropriateBrowser(), sub_page);
   }
 
   virtual void ShowNetworkSettings(const std::string& service_path) OVERRIDE {
     if (!LoginState::Get()->IsUserLoggedIn())
       return;
-
-    std::string page = chrome::kInternetOptionsSubPage;
-    const chromeos::NetworkState* network = service_path.empty() ? NULL :
-        NetworkHandler::Get()->network_state_handler()->GetNetworkState(
-            service_path);
-    if (network) {
-      std::string name(network->name());
-      if (name.empty() && network->type() == flimflam::kTypeEthernet)
-        name = l10n_util::GetStringUTF8(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
-      page += base::StringPrintf(
-          "?servicePath=%s&networkType=%s&networkName=%s",
-          net::EscapeUrlEncodedData(service_path, true).c_str(),
-          net::EscapeUrlEncodedData(network->type(), true).c_str(),
-          net::EscapeUrlEncodedData(name, false).c_str());
-    }
-    content::RecordAction(
-        content::UserMetricsAction("OpenInternetOptionsDialog"));
-    chrome::ShowSettingsSubPage(GetAppropriateBrowser(), page);
+    network_connect::ShowNetworkSettings(service_path);
   }
 
   virtual void ShowBluetoothSettings() OVERRIDE {
     // TODO(sad): Make this work.
   }
 
   virtual void ShowDisplaySettings() OVERRIDE {
     content::RecordAction(content::UserMetricsAction("ShowDisplayOptions"));
     chrome::ShowSettingsSubPage(GetAppropriateBrowser(),
                                 kDisplaySettingsSubPageName);
@@ skipping 240 matching lines @@
       return;
 
     *list = ConvertToDriveStatusList(
         integration_service->job_list()->GetJobInfoList());
   }
 
   virtual void ConfigureNetwork(const std::string& network_id) OVERRIDE {
     network_connect::HandleUnconfiguredNetwork(network_id, GetNativeWindow());
   }
 
-  virtual void ConnectToNetwork(const std::string& network_id) OVERRIDE {
-    DCHECK(!CommandLine::ForCurrentProcess()->HasSwitch(
-        chromeos::switches::kUseNewNetworkConnectionHandler));
-    network_connect::ConnectResult result =
-        network_connect::ConnectToNetwork(network_id, GetNativeWindow());
-    if (result == network_connect::NETWORK_NOT_FOUND)
-      ShowNetworkSettings("");
-    else if (result == network_connect::CONNECT_NOT_STARTED)
-      ShowNetworkSettings(network_id);
+  virtual void EnrollOrConfigureNetwork(
+      const std::string& network_id,
+      gfx::NativeWindow parent_window) OVERRIDE {
+    if (network_connect::EnrollNetwork(network_id, parent_window))
+      return;
+    network_connect::HandleUnconfiguredNetwork(network_id, parent_window);
   }
 
   virtual void ManageBluetoothDevices() OVERRIDE {
     content::RecordAction(
         content::UserMetricsAction("ShowBluetoothSettingsPage"));
     std::string sub_page = std::string(chrome::kSearchSubPage) + "#" +
         l10n_util::GetStringUTF8(IDS_OPTIONS_SETTINGS_SECTION_TITLE_BLUETOOTH);
     chrome::ShowSettingsSubPage(GetAppropriateBrowser(), sub_page);
   }
 
   virtual void ToggleBluetooth() OVERRIDE {
     bluetooth_adapter_->SetPowered(!bluetooth_adapter_->IsPowered(),
                                    base::Bind(&base::DoNothing),
                                    base::Bind(&BluetoothPowerFailure));
   }
 
   virtual void ShowMobileSimDialog() OVERRIDE {
     SimDialogDelegate::ShowDialog(GetNativeWindow(),
                                   SimDialogDelegate::SIM_DIALOG_UNLOCK);
   }
 
+  virtual void ShowMobileSetup(const std::string& network_id) OVERRIDE {
+    network_connect::ShowMobileSetup(network_id);
+  }
+
   virtual void ShowOtherWifi() OVERRIDE {
-    NetworkConfigView::ShowForType(chromeos::TYPE_WIFI, GetNativeWindow());
+    NetworkConfigView::ShowForType(flimflam::kTypeWifi, GetNativeWindow());
   }
 
   virtual void ShowOtherVPN() OVERRIDE {
-    NetworkConfigView::ShowForType(chromeos::TYPE_VPN, GetNativeWindow());
+    NetworkConfigView::ShowForType(flimflam::kTypeVPN, GetNativeWindow());
   }
 
   virtual void ShowOtherCellular() OVERRIDE {
     ChooseMobileNetworkDialog::ShowDialog(GetNativeWindow());
   }
 
   virtual bool GetBluetoothAvailable() OVERRIDE {
     return bluetooth_adapter_->IsPresent();
   }
 
@@ skipping 429 matching lines @@
       search_mapped_to_caps_lock = true;
     GetSystemTrayNotifier()->NotifyCapsLockChanged(
         enabled, search_mapped_to_caps_lock);
   }
 
   // Overridden from ash::NetworkTrayDelegate
   virtual void NotificationLinkClicked(
       ash::NetworkObserver::MessageType message_type,
       size_t link_index) OVERRIDE {
     if (message_type == ash::NetworkObserver::ERROR_OUT_OF_CREDITS) {
-      const CellularNetwork* cellular =
-          NetworkLibrary::Get()->cellular_network();
-      if (cellular)
-        ConnectToNetwork(cellular->service_path());
+      const NetworkState* cellular =
+          NetworkHandler::Get()->network_state_handler()->
+          FirstNetworkByType(flimflam::kTypeCellular);
+      std::string service_path = cellular ? cellular->path() : "";
+      ShowNetworkSettings(service_path);
+
       ash::Shell::GetInstance()->system_tray_notifier()->
           NotifyClearNetworkMessage(message_type);
     }
     if (message_type != ash::NetworkObserver::MESSAGE_DATA_PROMO)
       return;
     // If we have deal info URL defined that means that there're
     // 2 links in bubble. Let the user close it manually then thus giving
     // ability to navigate to second link.
     // mobile_data_bubble_ will be set to NULL in BubbleClosing callback.
     std::string deal_info_url = data_promo_notification_->deal_info_url();
@@ skipping 99 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
 };
 
 }  // namespace
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new chromeos::SystemTrayDelegate();
 }
 
 }  // namespace chromeos