| 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_H_ | 5 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ |
| 6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ | 6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 246 // Note that the value is only valid when |system_bubble_| is true. | 246 // Note that the value is only valid when |system_bubble_| is true. |
| 247 bool full_system_tray_menu_; | 247 bool full_system_tray_menu_; |
| 248 | 248 |
| 249 TrayAccessibility* tray_accessibility_; // not owned | 249 TrayAccessibility* tray_accessibility_; // not owned |
| 250 TrayCast* tray_cast_; | 250 TrayCast* tray_cast_; |
| 251 TrayDate* tray_date_; | 251 TrayDate* tray_date_; |
| 252 TrayUpdate* tray_update_; | 252 TrayUpdate* tray_update_; |
| 253 | 253 |
| 254 // A reference to the Screen share and capture item. | 254 // A reference to the Screen share and capture item. |
| 255 ScreenTrayItem* screen_capture_tray_item_; // not owned | 255 ScreenTrayItem* screen_capture_tray_item_; // not owned |
| 256 ScreenTrayItem* screen_share_tray_item_; // not owned | 256 ScreenTrayItem* screen_share_tray_item_; // not owned |
| 257 | 257 |
| 258 DISALLOW_COPY_AND_ASSIGN(SystemTray); | 258 DISALLOW_COPY_AND_ASSIGN(SystemTray); |
| 259 }; | 259 }; |
| 260 | 260 |
| 261 } // namespace ash | 261 } // namespace ash |
| 262 | 262 |
| 263 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ | 263 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ |
| OLD | NEW |