| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ | 5 #ifndef ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ |
| 6 #define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ | 6 #define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 struct IMEInfo; | 29 struct IMEInfo; |
| 30 struct IMEPropertyInfo; | 30 struct IMEPropertyInfo; |
| 31 | 31 |
| 32 class CustodianInfoTrayObserver; | 32 class CustodianInfoTrayObserver; |
| 33 class SystemTray; | 33 class SystemTray; |
| 34 class SystemTrayItem; | 34 class SystemTrayItem; |
| 35 | 35 |
| 36 using IMEInfoList = std::vector<IMEInfo>; | 36 using IMEInfoList = std::vector<IMEInfo>; |
| 37 using IMEPropertyInfoList = std::vector<IMEPropertyInfo>; | 37 using IMEPropertyInfoList = std::vector<IMEPropertyInfo>; |
| 38 | 38 |
| 39 // TODO(jamescook): Move to TrayBluetoothHelper. http://crbug.com/660043 |
| 39 struct ASH_EXPORT BluetoothDeviceInfo { | 40 struct ASH_EXPORT BluetoothDeviceInfo { |
| 40 BluetoothDeviceInfo(); | 41 BluetoothDeviceInfo(); |
| 41 BluetoothDeviceInfo(const BluetoothDeviceInfo& other); | 42 BluetoothDeviceInfo(const BluetoothDeviceInfo& other); |
| 42 ~BluetoothDeviceInfo(); | 43 ~BluetoothDeviceInfo(); |
| 43 | 44 |
| 44 std::string address; | 45 std::string address; |
| 45 base::string16 display_name; | 46 base::string16 display_name; |
| 46 bool connected; | 47 bool connected; |
| 47 bool connecting; | 48 bool connecting; |
| 48 bool paired; | 49 bool paired; |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 197 // Creates a system tray item for display rotation lock. | 198 // Creates a system tray item for display rotation lock. |
| 198 // TODO(jamescook): Remove this when mus has support for display management | 199 // TODO(jamescook): Remove this when mus has support for display management |
| 199 // and we have a DisplayManager equivalent. See http://crbug.com/548429 | 200 // and we have a DisplayManager equivalent. See http://crbug.com/548429 |
| 200 virtual std::unique_ptr<SystemTrayItem> CreateRotationLockTrayItem( | 201 virtual std::unique_ptr<SystemTrayItem> CreateRotationLockTrayItem( |
| 201 SystemTray* tray); | 202 SystemTray* tray); |
| 202 }; | 203 }; |
| 203 | 204 |
| 204 } // namespace ash | 205 } // namespace ash |
| 205 | 206 |
| 206 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ | 207 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ |
| OLD | NEW |