Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Unified Diff: chromeos/components/tether/tether_connector.h

Issue 2857853005: [CrOS Tether] Create TetherDisconnector, which disconnects from active tethering sessions. (Closed)
Patch Set: Test updated. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromeos/components/tether/tether_connector.h
diff --git a/chromeos/components/tether/tether_connector.h b/chromeos/components/tether/tether_connector.h
index d07b772ae87514be00f9d17ae9d5a27dfac63b4e..9f7f591960131937eb61d9836f3dd6e249461bcb 100644
--- a/chromeos/components/tether/tether_connector.h
+++ b/chromeos/components/tether/tether_connector.h
@@ -28,11 +28,9 @@ class WifiHotspotConnector;
// initiates a connection by starting a ConnectTetheringOperation. When a
// response has been received from the tether host, TetherConnector connects to
// the associated Wi-Fi network.
-class TetherConnector : public NetworkConnectionHandler::TetherDelegate,
- public ConnectTetheringOperation::Observer {
+class TetherConnector : public ConnectTetheringOperation::Observer {
public:
TetherConnector(
- NetworkConnectionHandler* network_connection_handler,
NetworkStateHandler* network_state_handler,
WifiHotspotConnector* wifi_hotspot_connector,
ActiveHost* active_host,
@@ -40,13 +38,15 @@ class TetherConnector : public NetworkConnectionHandler::TetherDelegate,
BleConnectionManager* connection_manager,
TetherHostResponseRecorder* tether_host_response_recorder,
DeviceIdTetherNetworkGuidMap* device_id_tether_network_guid_map);
- ~TetherConnector() override;
+ virtual ~TetherConnector();
- // NetworkConnectionHandler::TetherDelegate:
- void ConnectToNetwork(
+ virtual void ConnectToNetwork(
const std::string& tether_network_guid,
const base::Closure& success_callback,
- const network_handler::StringResultCallback& error_callback) override;
+ const network_handler::StringResultCallback& error_callback);
+
+ // Returns whether the connection attempt was successfully canceled.
+ virtual bool CancelConnectionAttempt(const std::string& tether_network_guid);
// ConnectTetheringOperation::Observer:
void OnSuccessfulConnectTetheringResponse(
@@ -60,7 +60,7 @@ class TetherConnector : public NetworkConnectionHandler::TetherDelegate,
private:
friend class TetherConnectorTest;
- void SetConnectionFailed();
+ void SetConnectionFailed(const std::string& error_name);
void SetConnectionSucceeded(const std::string& device_id,
const std::string& wifi_network_guid);

Powered by Google App Engine
This is Rietveld 408576698