| 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 14 matching lines...) Expand all Loading... |
| 25 class SystemBubbleWrapper; | 25 class SystemBubbleWrapper; |
| 26 class SystemTrayDelegate; | 26 class SystemTrayDelegate; |
| 27 class SystemTrayItem; | 27 class SystemTrayItem; |
| 28 class TrayAccessibility; | 28 class TrayAccessibility; |
| 29 class TrayAudio; | 29 class TrayAudio; |
| 30 class TrayCast; | 30 class TrayCast; |
| 31 class TrayDate; | 31 class TrayDate; |
| 32 class TraySystemInfo; | 32 class TraySystemInfo; |
| 33 class TrayTiles; | 33 class TrayTiles; |
| 34 class TrayUpdate; | 34 class TrayUpdate; |
| 35 class TrayUser; | |
| 36 class WebNotificationTray; | 35 class WebNotificationTray; |
| 37 | 36 |
| 38 // There are different methods for creating bubble views. | 37 // There are different methods for creating bubble views. |
| 39 enum BubbleCreationType { | 38 enum BubbleCreationType { |
| 40 BUBBLE_CREATE_NEW, // Closes any existing bubble and creates a new one. | 39 BUBBLE_CREATE_NEW, // Closes any existing bubble and creates a new one. |
| 41 BUBBLE_USE_EXISTING, // Uses any existing bubble, or creates a new one. | 40 BUBBLE_USE_EXISTING, // Uses any existing bubble, or creates a new one. |
| 42 }; | 41 }; |
| 43 | 42 |
| 44 class ASH_EXPORT SystemTray : public TrayBackgroundView, | 43 class ASH_EXPORT SystemTray : public TrayBackgroundView, |
| 45 public views::TrayBubbleView::Delegate { | 44 public views::TrayBubbleView::Delegate { |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 std::unique_ptr<KeyEventWatcher> key_event_watcher_; | 281 std::unique_ptr<KeyEventWatcher> key_event_watcher_; |
| 283 | 282 |
| 284 std::unique_ptr<ActivationObserver> activation_observer_; | 283 std::unique_ptr<ActivationObserver> activation_observer_; |
| 285 | 284 |
| 286 DISALLOW_COPY_AND_ASSIGN(SystemTray); | 285 DISALLOW_COPY_AND_ASSIGN(SystemTray); |
| 287 }; | 286 }; |
| 288 | 287 |
| 289 } // namespace ash | 288 } // namespace ash |
| 290 | 289 |
| 291 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ | 290 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ |
| OLD | NEW |