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

Unified Diff: chromeos/network/network_connection_handler.h

Issue 21046008: Convert all connect code to use NetworkHandler instead of NetworkLibrary (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Restore check VPN PassphraseRequred Created 7 years, 5 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/network/network_connection_handler.h
diff --git a/chromeos/network/network_connection_handler.h b/chromeos/network/network_connection_handler.h
index 8f00a8ad10ff9cfc82c0a533b01b78e21b4af331..3fc809afd43b0e626d229e8ae2f1ec6e19e459dd 100644
--- a/chromeos/network/network_connection_handler.h
+++ b/chromeos/network/network_connection_handler.h
@@ -58,7 +58,6 @@ class CHROMEOS_EXPORT NetworkConnectionHandler
static const char kErrorConfigurationRequired[];
static const char kErrorShillError[];
static const char kErrorConnectFailed[];
- static const char kErrorDisconnectFailed[];
static const char kErrorMissingProviderType[];
static const char kErrorUnknown[];
@@ -99,6 +98,17 @@ class CHROMEOS_EXPORT NetworkConnectionHandler
const base::Closure& success_callback,
const network_handler::ErrorCallback& error_callback);
+ // ActivateNetwork() will start an asynchronous activation attempt.
+ // |carrier| may be empty or may specify a carrier to activate.
+ // On success, |success_callback| will be called.
+ // On failure, |error_callback| will be called with |error_name| one of:
+ // kErrorNotFound if no network matching |service_path| is found.
+ // kErrorShillError if a DBus or Shill error occurred.
+ void ActivateNetwork(const std::string& service_path,
+ const std::string& carrier,
+ const base::Closure& success_callback,
+ const network_handler::ErrorCallback& error_callback);
+
// Returns true if ConnectToNetwork has been called with |service_path| and
// has not completed (i.e. success or error callback has been called).
bool HasConnectingNetwork(const std::string& service_path);
@@ -167,6 +177,17 @@ class CHROMEOS_EXPORT NetworkConnectionHandler
void HandleShillDisconnectSuccess(const std::string& service_path,
const base::Closure& success_callback);
+ // Calls Shill.Manager.Activate asynchronously.
+ void CallShillActivate(
+ const std::string& service_path,
+ const std::string& carrier,
+ const base::Closure& success_callback,
+ const network_handler::ErrorCallback& error_callback);
+
+ // Handle success or failure from Shill.Service.ActivateCellularModem.
gauravsh 2013/08/02 23:40:22 NIT: s/or failure//
stevenjb 2013/08/06 00:32:48 Done.
+ void HandleShillActivateSuccess(const std::string& service_path,
+ const base::Closure& success_callback);
+
// Local references to the associated handler instances.
CertLoader* cert_loader_;
NetworkStateHandler* network_state_handler_;

Powered by Google App Engine
This is Rietveld 408576698