Chromium Code Reviews| 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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 60 std::string address; | 60 std::string address; |
| 61 base::string16 display_name; | 61 base::string16 display_name; |
| 62 bool connected; | 62 bool connected; |
| 63 bool connecting; | 63 bool connecting; |
| 64 bool paired; | 64 bool paired; |
| 65 }; | 65 }; |
| 66 | 66 |
| 67 using BluetoothDeviceList = std::vector<BluetoothDeviceInfo>; | 67 using BluetoothDeviceList = std::vector<BluetoothDeviceInfo>; |
| 68 | 68 |
| 69 struct ASH_EXPORT UpdateInfo { | 69 struct ASH_EXPORT UpdateInfo { |
| 70 enum UpdateSeverity { | 70 enum UpdateSeverity { |
|
tdanderson
2016/08/16 21:18:45
Any suggestions on how we can eliminate the need f
James Cook
2016/08/16 21:48:56
You could create a shared header somewhere in //co
| |
| 71 UPDATE_NORMAL, | 71 UPDATE_NONE, |
| 72 UPDATE_LOW_GREEN, | 72 UPDATE_LOW, |
| 73 UPDATE_HIGH_ORANGE, | 73 UPDATE_ELEVATED, |
| 74 UPDATE_SEVERE_RED, | 74 UPDATE_HIGH, |
| 75 UPDATE_SEVERE, | |
| 76 UPDATE_CRITICAL, | |
| 75 }; | 77 }; |
| 76 | 78 |
| 77 UpdateInfo(); | 79 UpdateInfo(); |
| 78 ~UpdateInfo(); | 80 ~UpdateInfo(); |
| 79 | 81 |
| 80 UpdateSeverity severity; | 82 UpdateSeverity severity; |
| 81 bool update_required; | 83 bool update_required; |
| 82 bool factory_reset_required; | 84 bool factory_reset_required; |
| 83 }; | 85 }; |
| 84 | 86 |
| (...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 329 // Creates a system tray item for display rotation lock. | 331 // Creates a system tray item for display rotation lock. |
| 330 // TODO(jamescook): Remove this when mus has support for display management | 332 // TODO(jamescook): Remove this when mus has support for display management |
| 331 // and we have a DisplayManager equivalent. See http://crbug.com/548429 | 333 // and we have a DisplayManager equivalent. See http://crbug.com/548429 |
| 332 virtual std::unique_ptr<SystemTrayItem> CreateRotationLockTrayItem( | 334 virtual std::unique_ptr<SystemTrayItem> CreateRotationLockTrayItem( |
| 333 SystemTray* tray); | 335 SystemTray* tray); |
| 334 }; | 336 }; |
| 335 | 337 |
| 336 } // namespace ash | 338 } // namespace ash |
| 337 | 339 |
| 338 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ | 340 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ |
| OLD | NEW |