Convert all connect code to use NetworkHandler instead of NetworkLibrary

ash/system/tray/system_tray_delegate.h

 // 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.
 
 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/system/user/login_status.h"
 #include "base/files/file_path.h"
 #include "base/i18n/time_formatting.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/native_widget_types.h"
 
 namespace base {
 class TimeDelta;
 class TimeTicks;
 }
 
 namespace ash {
 
 struct ASH_EXPORT NetworkIconInfo {
   NetworkIconInfo();
@@ skipping 216 matching lines @@
   // Cancels ongoing drive operation.
   virtual void CancelDriveOperation(int32 operation_id) = 0;
 
   // Returns information about the ongoing drive operations.
   virtual void GetDriveOperationStatusList(
       DriveOperationStatusList* list) = 0;
 
   // Shows UI to configure or activate the network specified by |network_id|.
   virtual void ConfigureNetwork(const std::string& network_id) = 0;
 
-  // Sends a connect request for the network specified by |network_id|.
-  virtual void ConnectToNetwork(const std::string& network_id) = 0;
+  // Shows UI to enroll the network specified by |network_id| if appropriate,
+  // otherwise behaves the same as ConfigureNetwork. |parent_window| is used
+  // to parent any configuration UI. If NULL a default window will be used.
+  virtual void EnrollOrConfigureNetwork(const std::string& network_id,
+                                        gfx::NativeWindow parent_window) = 0;
 
   // Shows UI to manage bluetooth devices.
   virtual void ManageBluetoothDevices() = 0;
 
   // Toggles bluetooth.
   virtual void ToggleBluetooth() = 0;
 
   // Shows UI to unlock a mobile sim.
   virtual void ShowMobileSimDialog() = 0;
 
+  // Shows UI to setup a mobile network.
+  virtual void ShowMobileSetup(const std::string& network_id) = 0;
+
   // Shows UI to connect to an unlisted wifi network.
   virtual void ShowOtherWifi() = 0;
 
   // Shows UI to configure vpn.
   virtual void ShowOtherVPN() = 0;
 
   // Shows UI to search for cellular networks.
   virtual void ShowOtherCellular() = 0;
 
   // Returns whether bluetooth capability is available.
@@ skipping 40 matching lines @@
   // Speaks the given text if spoken feedback is enabled.
   virtual void MaybeSpeak(const std::string& utterance) const = 0;
 
   // Creates a dummy delegate for testing.
   static SystemTrayDelegate* CreateDummyDelegate();
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_