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 05d594c0659fe47c79ef8e3c263503cb63f9867a..e328982279fc0bc322c1c3b1f9c1daca2cf2d50f 100644 |
| --- a/ash/system/tray/system_tray_delegate.h |
| +++ b/ash/system/tray/system_tray_delegate.h |
| @@ -30,6 +30,17 @@ struct ASH_EXPORT NetworkIconInfo { |
| std::string service_path; |
| }; |
| +struct ASH_EXPORT BluetoothDeviceInfo { |
| + BluetoothDeviceInfo(); |
| + ~BluetoothDeviceInfo(); |
| + |
| + std::string address; |
| + string16 display_name; |
| + bool connected; |
| +}; |
| + |
| +typedef std::vector<BluetoothDeviceInfo> BluetoothDeviceList; |
| + |
| struct ASH_EXPORT IMEInfo { |
| IMEInfo(); |
| ~IMEInfo(); |
| @@ -72,9 +83,12 @@ class SystemTrayDelegate { |
| // Shows the settings related to date, timezone etc. |
| virtual void ShowDateSettings() = 0; |
| - // Show the settings related to network. |
| + // Shows the settings related to network. |
| virtual void ShowNetworkSettings() = 0; |
| + // Shows the settings related to bluetooth. |
| + virtual void ShowBluetoothSettings() = 0; |
| + |
| // Shows help. |
| virtual void ShowHelp() = 0; |
| @@ -105,6 +119,9 @@ class SystemTrayDelegate { |
| // Attempts to lock the screen. |
| virtual void RequestLockScreen() = 0; |
| + // Returns a list of available bluetooth devices. |
| + virtual BluetoothDeviceList GetAvailableBluetoothDevices() = 0; |
|
Ben Goodger (Google)
2012/03/21 15:52:14
virtual void GetAvailableBluetoothDevices(Bluetoot
sadrul
2012/03/21 16:16:42
Done. (also did so for IMEInfoList below)
|
| + |
| // Returns a list of availble IMEs. |
| virtual IMEInfoList GetAvailableIMEList() = 0; |
| @@ -119,6 +136,9 @@ class SystemTrayDelegate { |
| // Connects to the network specified by the unique id. |
| virtual void ConnectToNetwork(const std::string& network_id) = 0; |
| + // Shous UI to add a new bluetooth device. |
| + virtual void AddBluetoothDevice() = 0; |
| + |
| // Toggles airplane mode. |
| virtual void ToggleAirplaneMode() = 0; |
| @@ -128,18 +148,27 @@ class SystemTrayDelegate { |
| // Toggles cellular network. |
| virtual void ToggleCellular() = 0; |
| + // Toggles bluetooth. |
| + virtual void ToggleBluetooth() = 0; |
| + |
| // Returns whether wifi is available. |
| virtual bool GetWifiAvailable() = 0; |
| // Returns whether cellular networking is available. |
| virtual bool GetCellularAvailable() = 0; |
| + // Returns whether bluetooth capability is available. |
| + virtual bool GetBluetoothAvailable() = 0; |
| + |
| // Returns whether wifi is enabled. |
| virtual bool GetWifiEnabled() = 0; |
| // Returns whether cellular networking is enabled. |
| virtual bool GetCellularEnabled() = 0; |
| + // Returns whether bluetooth is enabled. |
| + virtual bool GetBluetoothEnabled() = 0; |
| + |
| // Shows UI for changing proxy settings. |
| virtual void ChangeProxySettings() = 0; |
| }; |