[CrOS Tether] Add disconnect handling to NetworkConnectionHandler::TetherDelegate.

chromeos/network/network_connection_handler.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 CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_
 #define CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 56 matching lines @@
   // Additional configuration is required.
   static const char kErrorConfigurationRequired[];
 
   // Configuration failed during the configure stage of the connect flow.
   static const char kErrorConfigureFailed[];
 
   // An unexpected DBus, Shill, or Tether communication error occurred while
   // connecting.
   static const char kErrorConnectFailed[];
 
-  // An unexpected DBus or Shill error occurred while disconnecting.
+  // An unexpected DBus, Shill, or Tether error occurred while disconnecting.
   static const char kErrorDisconnectFailed[];
 
   // A new network connect request canceled this one.
   static const char kErrorConnectCanceled[];
 
   // Constants for |error_name| from |error_callback| for Disconnect.
   static const char kErrorNotConnected[];
 
   // Certificate load timed out.
   static const char kErrorCertLoadTimeout[];
 
   // Trying to configure an unmanged network but policy prohibits that
   static const char kErrorUnmanagedNetwork[];
 
   // Network activation failed.
   static const char kErrorActivateFailed[];
 
   // Network was enabled/disabled when it was not available.
   static const char kErrorEnabledOrDisabledWhenNotAvailable[];
 
-  // Connection to Tether network attempted when no tether delegate present.
-  static const char kErrorTetherConnectionAttemptWithNoDelegate[];
+  // Connection or disconnection to Tether network attempted when no tether
+  // delegate present.
+  static const char kErrorTetherAttemptWithNoDelegate[];
 
   class CHROMEOS_EXPORT TetherDelegate {
    public:
     // Connects to the Tether network with GUID |tether_network_guid|. On
     // success, invokes |success_callback|, and on failure, invokes
     // |error_callback|, passing the relevant error code declared above.
     virtual void ConnectToNetwork(
         const std::string& tether_network_guid,
         const base::Closure& success_callback,
         const network_handler::StringResultCallback& error_callback) = 0;
 
+    // Disconnects from the Tether network with GUID |tether_network_guid|. On
+    // success, invokes |success_callback|, and on failure, invokes
+    // |error_callback|, passing the relevant error code declared above.
+    virtual void DisconnectFromNetwork(
+        const std::string& tether_network_guid,
+        const base::Closure& success_callback,
+        const network_handler::StringResultCallback& error_callback) = 0;
+
    protected:
     virtual ~TetherDelegate() {}
   };
 
   virtual ~NetworkConnectionHandler();
 
   void AddObserver(NetworkConnectionObserver* observer);
   void RemoveObserver(NetworkConnectionObserver* observer);
 
   // Sets the TetherDelegate to handle Tether actions. |tether_delegate| is
@@ skipping 51 matching lines @@
       const std::string& service_path,
       const network_handler::ErrorCallback& error_callback,
       const std::string& error_name);
 
   // Initiates a connection to a Tether network.
   void InitiateTetherNetworkConnection(
       const std::string& tether_network_guid,
       const base::Closure& success_callback,
       const network_handler::ErrorCallback& error_callback);
 
+  // Initiates a disconnection from a Tether network.
+  void InitiateTetherNetworkDisconnection(
+      const std::string& tether_network_guid,
+      const base::Closure& success_callback,
+      const network_handler::ErrorCallback& error_callback);
+
   base::ObserverList<NetworkConnectionObserver, true> observers_;
 
   // Delegate used to start a connection to a tether network.
   TetherDelegate* tether_delegate_;
 
  private:
   // Only to be used by NetworkConnectionHandler implementation (and not by
   // derived classes).
   base::WeakPtrFactory<NetworkConnectionHandler> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkConnectionHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_NETWORK_CONNECTION_HANDLER_H_