| 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_H_ | 5 #ifndef ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ |
| 6 #define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ | 6 #define ASH_COMMON_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 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 TrayAccessibility* tray_accessibility_; | 276 TrayAccessibility* tray_accessibility_; |
| 277 TrayAudio* tray_audio_; // May be null. | 277 TrayAudio* tray_audio_; // May be null. |
| 278 TrayCast* tray_cast_; | 278 TrayCast* tray_cast_; |
| 279 TrayDate* tray_date_; | 279 TrayDate* tray_date_; |
| 280 TrayUpdate* tray_update_; | 280 TrayUpdate* tray_update_; |
| 281 | 281 |
| 282 // A reference to the Screen share and capture item. | 282 // A reference to the Screen share and capture item. |
| 283 ScreenTrayItem* screen_capture_tray_item_; // not owned | 283 ScreenTrayItem* screen_capture_tray_item_; // not owned |
| 284 ScreenTrayItem* screen_share_tray_item_; // not owned | 284 ScreenTrayItem* screen_share_tray_item_; // not owned |
| 285 | 285 |
| 286 // TODO(oshima): Remove this when crbug.com/651242 is fixed. |
| 287 bool activating_ = false; |
| 288 |
| 286 std::unique_ptr<KeyEventWatcher> key_event_watcher_; | 289 std::unique_ptr<KeyEventWatcher> key_event_watcher_; |
| 287 | 290 |
| 288 std::unique_ptr<ActivationObserver> activation_observer_; | 291 std::unique_ptr<ActivationObserver> activation_observer_; |
| 289 | 292 |
| 290 DISALLOW_COPY_AND_ASSIGN(SystemTray); | 293 DISALLOW_COPY_AND_ASSIGN(SystemTray); |
| 291 }; | 294 }; |
| 292 | 295 |
| 293 } // namespace ash | 296 } // namespace ash |
| 294 | 297 |
| 295 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ | 298 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ |
| OLD | NEW |