Chromium Code Reviews| Index: ash/system/tray/system_tray_delegate.h |
| diff --git a/ash/system/tray/system_tray_delegate.h b/ash/system/tray/system_tray_delegate.h |
| index 45b0c71c8cd56f5b008a2d50f33251e396c50d4d..07209ac436109b21bbe0fa0c92743d748083771b 100644 |
| --- a/ash/system/tray/system_tray_delegate.h |
| +++ b/ash/system/tray/system_tray_delegate.h |
| @@ -15,6 +15,7 @@ |
| #include "base/memory/scoped_ptr.h" |
| #include "base/strings/string16.h" |
| #include "ui/gfx/image/image_skia.h" |
| +#include "ui/gfx/native_widget_types.h" |
| namespace base { |
| class TimeDelta; |
| @@ -250,8 +251,10 @@ class SystemTrayDelegate { |
| // Shows UI to configure or activate the network specified by |network_id|. |
| virtual void ConfigureNetwork(const std::string& network_id) = 0; |
| - // Sends a connect request for the network specified by |network_id|. |
| - virtual void ConnectToNetwork(const std::string& network_id) = 0; |
| + // Shows UI to enroll the network specified by |network_id| if appropriate, |
|
pneubeck (no reviews)
2013/08/06 15:45:19
here, at ConfigureNetwork and ShowMobileSetup: wha
stevenjb
2013/08/06 20:23:55
Talk to sadrul; I didn't want to rename this every
|
| + // otherwise behaves the same as ConfigureNetwork. |
|
pneubeck (no reviews)
2013/08/06 15:45:19
what about parent_window == NULL ?
stevenjb
2013/08/06 20:23:55
Added comment.
|
| + virtual void EnrollOrConfigureNetwork(const std::string& network_id, |
| + gfx::NativeWindow parent_window) = 0; |
| // Shows UI to manage bluetooth devices. |
| virtual void ManageBluetoothDevices() = 0; |
| @@ -262,6 +265,9 @@ class SystemTrayDelegate { |
| // Shows UI to unlock a mobile sim. |
| virtual void ShowMobileSimDialog() = 0; |
| + // Shows UI to setup a mobile network. |
| + virtual void ShowMobileSetup(const std::string& network_id) = 0; |
| + |
| // Shows UI to connect to an unlisted wifi network. |
| virtual void ShowOtherWifi() = 0; |