| 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..65c430d073e4225b6a8e46e63c9baf9b810aa9e9 100644
|
| --- a/ash/system/chromeos/network/network_connect.h
|
| +++ b/ash/system/chromeos/network/network_connect.h
|
| @@ -9,12 +9,35 @@
|
|
|
| #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 {
|
|
|
| -// 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 certificate
|
| +// enrollment). If NULL, the default window will be used.
|
| +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 a dictionary of Shill properties, then sends a
|
| +// connect request. The profile is set according to 'shared' if allowed.
|
| +ASH_EXPORT void ConfigureNetworkAndConnect(
|
| + const std::string& service_path,
|
| + const base::DictionaryValue& properties,
|
| + bool shared);
|
| +
|
| +// Requests a new network configuration to be created from a dictionary of
|
| +// Shill 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);
|
|
|