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 UPDATE_SEVERE, | 60 UPDATE_SEVERE, |
61 UPDATE_CRITICAL, | 61 UPDATE_CRITICAL, |
62 }; | 62 }; |
63 | 63 |
64 UpdateInfo(); | 64 UpdateInfo(); |
65 ~UpdateInfo(); | 65 ~UpdateInfo(); |
66 | 66 |
67 UpdateSeverity severity; | 67 UpdateSeverity severity; |
68 bool update_required; | 68 bool update_required; |
69 bool factory_reset_required; | 69 bool factory_reset_required; |
70 bool component_update_required; | |
James Cook
2016/11/30 23:01:41
nit (if you keep this): Document this. Might be he
| |
70 }; | 71 }; |
71 | 72 |
72 class CastConfigDelegate; | 73 class CastConfigDelegate; |
73 class NetworkingConfigDelegate; | 74 class NetworkingConfigDelegate; |
74 | 75 |
75 // SystemTrayDelegate is intended for delegating tasks in the System Tray to the | 76 // SystemTrayDelegate is intended for delegating tasks in the System Tray to the |
76 // application (e.g. Chrome). These tasks should be limited to application | 77 // application (e.g. Chrome). These tasks should be limited to application |
77 // (browser) specific tasks. For non application specific tasks, where possible, | 78 // (browser) specific tasks. For non application specific tasks, where possible, |
78 // components/, chromeos/, device/, etc., code should be used directly. If more | 79 // components/, chromeos/, device/, etc., code should be used directly. If more |
79 // than one related method is being added, consider adding an additional | 80 // than one related method is being added, consider adding an additional |
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
219 // Creates a system tray item for display rotation lock. | 220 // Creates a system tray item for display rotation lock. |
220 // TODO(jamescook): Remove this when mus has support for display management | 221 // TODO(jamescook): Remove this when mus has support for display management |
221 // and we have a DisplayManager equivalent. See http://crbug.com/548429 | 222 // and we have a DisplayManager equivalent. See http://crbug.com/548429 |
222 virtual std::unique_ptr<SystemTrayItem> CreateRotationLockTrayItem( | 223 virtual std::unique_ptr<SystemTrayItem> CreateRotationLockTrayItem( |
223 SystemTray* tray); | 224 SystemTray* tray); |
224 }; | 225 }; |
225 | 226 |
226 } // namespace ash | 227 } // namespace ash |
227 | 228 |
228 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ | 229 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ |
OLD | NEW |