| 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> |
| 11 | 11 |
| 12 #include "ash/ash_export.h" | 12 #include "ash/ash_export.h" |
| 13 #include "ash/common/login_status.h" | 13 #include "ash/common/login_status.h" |
| 14 #include "ash/common/system/volume_control_delegate.h" | 14 #include "ash/common/system/volume_control_delegate.h" |
| 15 #include "base/callback_forward.h" | 15 #include "base/callback_forward.h" |
| 16 #include "base/files/file_path.h" | 16 #include "base/files/file_path.h" |
| 17 #include "base/i18n/time_formatting.h" | 17 #include "base/i18n/time_formatting.h" |
| 18 #include "base/strings/string16.h" | 18 #include "base/strings/string16.h" |
| 19 #include "ui/gfx/image/image_skia.h" | 19 #include "ui/gfx/image/image_skia.h" |
| 20 | 20 |
| 21 class AccountId; | 21 class AccountId; |
| 22 | 22 |
| 23 namespace base { | 23 namespace base { |
| 24 class TimeDelta; | 24 class TimeDelta; |
| 25 class TimeTicks; | 25 class TimeTicks; |
| 26 } | 26 } |
| 27 | 27 |
| 28 namespace device { |
| 29 enum class BluetoothDeviceType; |
| 30 } |
| 31 |
| 28 namespace ash { | 32 namespace ash { |
| 29 struct IMEInfo; | 33 struct IMEInfo; |
| 30 struct IMEPropertyInfo; | 34 struct IMEPropertyInfo; |
| 31 | 35 |
| 32 class CustodianInfoTrayObserver; | 36 class CustodianInfoTrayObserver; |
| 33 class ShutdownPolicyObserver; | 37 class ShutdownPolicyObserver; |
| 34 class SystemTray; | 38 class SystemTray; |
| 35 class SystemTrayItem; | 39 class SystemTrayItem; |
| 36 | 40 |
| 37 using IMEInfoList = std::vector<IMEInfo>; | 41 using IMEInfoList = std::vector<IMEInfo>; |
| (...skipping 10 matching lines...) Expand all Loading... |
| 48 bool tray_icon_visible; | 52 bool tray_icon_visible; |
| 49 gfx::ImageSkia image; | 53 gfx::ImageSkia image; |
| 50 base::string16 name; | 54 base::string16 name; |
| 51 base::string16 description; | 55 base::string16 description; |
| 52 std::string service_path; | 56 std::string service_path; |
| 53 bool is_cellular; | 57 bool is_cellular; |
| 54 }; | 58 }; |
| 55 | 59 |
| 56 struct ASH_EXPORT BluetoothDeviceInfo { | 60 struct ASH_EXPORT BluetoothDeviceInfo { |
| 57 BluetoothDeviceInfo(); | 61 BluetoothDeviceInfo(); |
| 62 BluetoothDeviceInfo(const BluetoothDeviceInfo& other); |
| 58 ~BluetoothDeviceInfo(); | 63 ~BluetoothDeviceInfo(); |
| 59 | 64 |
| 60 std::string address; | 65 std::string address; |
| 61 base::string16 display_name; | 66 base::string16 display_name; |
| 62 bool connected; | 67 bool connected; |
| 63 bool connecting; | 68 bool connecting; |
| 64 bool paired; | 69 bool paired; |
| 70 device::BluetoothDeviceType device_type; |
| 65 }; | 71 }; |
| 66 | 72 |
| 67 using BluetoothDeviceList = std::vector<BluetoothDeviceInfo>; | 73 using BluetoothDeviceList = std::vector<BluetoothDeviceInfo>; |
| 68 | 74 |
| 69 struct ASH_EXPORT UpdateInfo { | 75 struct ASH_EXPORT UpdateInfo { |
| 70 enum UpdateSeverity { | 76 enum UpdateSeverity { |
| 71 UPDATE_NONE, | 77 UPDATE_NONE, |
| 72 UPDATE_LOW, | 78 UPDATE_LOW, |
| 73 UPDATE_ELEVATED, | 79 UPDATE_ELEVATED, |
| 74 UPDATE_HIGH, | 80 UPDATE_HIGH, |
| (...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 319 // Creates a system tray item for display rotation lock. | 325 // Creates a system tray item for display rotation lock. |
| 320 // TODO(jamescook): Remove this when mus has support for display management | 326 // TODO(jamescook): Remove this when mus has support for display management |
| 321 // and we have a DisplayManager equivalent. See http://crbug.com/548429 | 327 // and we have a DisplayManager equivalent. See http://crbug.com/548429 |
| 322 virtual std::unique_ptr<SystemTrayItem> CreateRotationLockTrayItem( | 328 virtual std::unique_ptr<SystemTrayItem> CreateRotationLockTrayItem( |
| 323 SystemTray* tray); | 329 SystemTray* tray); |
| 324 }; | 330 }; |
| 325 | 331 |
| 326 } // namespace ash | 332 } // namespace ash |
| 327 | 333 |
| 328 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ | 334 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ |
| OLD | NEW |