| 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_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ | 5 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ |
| 6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ | 6 #define ASH_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/system/user/login_status.h" | 13 #include "ash/system/user/login_status.h" |
| 14 #include "ash/volume_control_delegate.h" | 14 #include "ash/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 #if defined(OS_CHROMEOS) |
| 22 #include "device/bluetooth/bluetooth_device.h" |
| 23 #endif |
| 24 |
| 21 class AccountId; | 25 class AccountId; |
| 22 | 26 |
| 23 namespace base { | 27 namespace base { |
| 24 class TimeDelta; | 28 class TimeDelta; |
| 25 class TimeTicks; | 29 class TimeTicks; |
| 26 } | 30 } |
| 27 | 31 |
| 28 namespace ash { | 32 namespace ash { |
| 29 | 33 |
| 30 class CustodianInfoTrayObserver; | 34 class CustodianInfoTrayObserver; |
| 31 class ShutdownPolicyObserver; | 35 class ShutdownPolicyObserver; |
| 32 | 36 |
| 33 struct ASH_EXPORT NetworkIconInfo { | 37 struct ASH_EXPORT NetworkIconInfo { |
| 34 NetworkIconInfo(); | 38 NetworkIconInfo(); |
| 35 ~NetworkIconInfo(); | 39 ~NetworkIconInfo(); |
| 36 | 40 |
| 37 bool highlight() const { return connected || connecting; } | 41 bool highlight() const { return connected || connecting; } |
| 38 | 42 |
| 39 bool connecting; | 43 bool connecting; |
| 40 bool connected; | 44 bool connected; |
| 41 bool tray_icon_visible; | 45 bool tray_icon_visible; |
| 42 gfx::ImageSkia image; | 46 gfx::ImageSkia image; |
| 43 base::string16 name; | 47 base::string16 name; |
| 44 base::string16 description; | 48 base::string16 description; |
| 45 std::string service_path; | 49 std::string service_path; |
| 46 bool is_cellular; | 50 bool is_cellular; |
| 47 }; | 51 }; |
| 48 | 52 |
| 53 #if defined(OS_CHROMEOS) |
| 49 struct ASH_EXPORT BluetoothDeviceInfo { | 54 struct ASH_EXPORT BluetoothDeviceInfo { |
| 50 BluetoothDeviceInfo(); | 55 BluetoothDeviceInfo(); |
| 56 BluetoothDeviceInfo(const BluetoothDeviceInfo& other); |
| 51 ~BluetoothDeviceInfo(); | 57 ~BluetoothDeviceInfo(); |
| 52 | 58 |
| 53 std::string address; | 59 std::string address; |
| 54 base::string16 display_name; | 60 base::string16 display_name; |
| 61 device::BluetoothDevice::DeviceType device_type; |
| 55 bool connected; | 62 bool connected; |
| 56 bool connecting; | 63 bool connecting; |
| 57 bool paired; | 64 bool paired; |
| 58 }; | 65 }; |
| 59 | 66 |
| 60 using BluetoothDeviceList = std::vector<BluetoothDeviceInfo>; | 67 using BluetoothDeviceList = std::vector<BluetoothDeviceInfo>; |
| 68 #endif |
| 61 | 69 |
| 62 struct ASH_EXPORT IMEPropertyInfo { | 70 struct ASH_EXPORT IMEPropertyInfo { |
| 63 IMEPropertyInfo(); | 71 IMEPropertyInfo(); |
| 64 ~IMEPropertyInfo(); | 72 ~IMEPropertyInfo(); |
| 65 | 73 |
| 66 bool selected; | 74 bool selected; |
| 67 std::string key; | 75 std::string key; |
| 68 base::string16 name; | 76 base::string16 name; |
| 69 }; | 77 }; |
| 70 | 78 |
| (...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 333 // asynchronously calls |callback| once a trusted policy becomes available. | 341 // asynchronously calls |callback| once a trusted policy becomes available. |
| 334 virtual void ShouldRebootOnShutdown(const RebootOnShutdownCallback& callback); | 342 virtual void ShouldRebootOnShutdown(const RebootOnShutdownCallback& callback); |
| 335 | 343 |
| 336 // Returns VPNDelegate. May return nullptr. | 344 // Returns VPNDelegate. May return nullptr. |
| 337 virtual VPNDelegate* GetVPNDelegate() const; | 345 virtual VPNDelegate* GetVPNDelegate() const; |
| 338 }; | 346 }; |
| 339 | 347 |
| 340 } // namespace ash | 348 } // namespace ash |
| 341 | 349 |
| 342 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ | 350 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ |
| OLD | NEW |