Index: ash/system/chromeos/network/network_connect.h |
diff --git a/ash/system/chromeos/network/network_connect.h b/ash/system/chromeos/network/network_connect.h |
index 3966140e9e82baf4aa516235b7bb07dd4569042e..475d9a09269a95cb29339b501092993b5a580524 100644 |
--- a/ash/system/chromeos/network/network_connect.h |
+++ b/ash/system/chromeos/network/network_connect.h |
@@ -9,12 +9,32 @@ |
#include "ash/ash_export.h" |
#include "base/strings/string16.h" |
+#include "ui/gfx/native_widget_types.h" // gfx::NativeWindow |
+ |
+namespace base { |
+class DictionaryValue; |
+} |
namespace ash { |
namespace network_connect { |
pneubeck (no reviews)
2013/08/06 15:45:19
nit: maybe add a comment that, here, 'properties'
stevenjb
2013/08/06 20:23:55
Modified comments of specific methods.
|
-// Request a network connection and handle any errors and notifications. |
-ASH_EXPORT void ConnectToNetwork(const std::string& service_path); |
+// Requests a network connection and handles any errors and notifications. |
+// |owning_window| is used to parent any UI on failure (e.g. for enrollment). |
pneubeck (no reviews)
2013/08/06 15:45:19
nite: not sure if 'enrollment' is self explanatory
stevenjb
2013/08/06 20:23:55
Done.
|
+ASH_EXPORT void ConnectToNetwork(const std::string& service_path, |
+ gfx::NativeWindow owning_window); |
+ |
+// Requests network activation and handles any errors and notifications. |
+ASH_EXPORT void ActivateCellular(const std::string& service_path); |
+ |
+// Configures a network with |properties| then sends a connect request. |
+ASH_EXPORT void ConfigureNetworkAndConnect( |
+ const std::string& service_path, |
+ const base::DictionaryValue& properties); |
+ |
+// Requests a new network configuration using |properties|. The profile used |
+// is determined by |shared|. |
+ASH_EXPORT void CreateConfigurationAndConnect(base::DictionaryValue* properties, |
+ bool shared); |
// Returns the localized string for shill error string |error|. |
ASH_EXPORT base::string16 ErrorString(const std::string& error); |