| 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 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 TrayCast* tray_cast_; | 231 TrayCast* tray_cast_; |
| 232 TrayNetwork* tray_network_; | 232 TrayNetwork* tray_network_; |
| 233 TrayTiles* tray_tiles_; // only used in material design. | 233 TrayTiles* tray_tiles_; // only used in material design. |
| 234 TraySystemInfo* tray_system_info_; // only used in material design. | 234 TraySystemInfo* tray_system_info_; // only used in material design. |
| 235 TrayUpdate* tray_update_; | 235 TrayUpdate* tray_update_; |
| 236 | 236 |
| 237 // A reference to the Screen share and capture item. | 237 // A reference to the Screen share and capture item. |
| 238 ScreenTrayItem* screen_capture_tray_item_; // not owned | 238 ScreenTrayItem* screen_capture_tray_item_; // not owned |
| 239 ScreenTrayItem* screen_share_tray_item_; // not owned | 239 ScreenTrayItem* screen_share_tray_item_; // not owned |
| 240 | 240 |
| 241 // TODO(oshima): Remove this when crbug.com/651242 is fixed. | |
| 242 bool activating_ = false; | |
| 243 | |
| 244 std::unique_ptr<KeyEventWatcher> key_event_watcher_; | 241 std::unique_ptr<KeyEventWatcher> key_event_watcher_; |
| 245 | 242 |
| 246 std::unique_ptr<ActivationObserver> activation_observer_; | 243 std::unique_ptr<ActivationObserver> activation_observer_; |
| 247 | 244 |
| 248 DISALLOW_COPY_AND_ASSIGN(SystemTray); | 245 DISALLOW_COPY_AND_ASSIGN(SystemTray); |
| 249 }; | 246 }; |
| 250 | 247 |
| 251 } // namespace ash | 248 } // namespace ash |
| 252 | 249 |
| 253 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ | 250 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ |
| OLD | NEW |