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_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ |
6 #define ASH_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> |
11 | 11 |
12 #include "ash/ash_export.h" | 12 #include "ash/ash_export.h" |
13 #include "ash/system/tray/system_tray_bubble.h" | 13 #include "ash/common/system/tray/system_tray_bubble.h" |
14 #include "ash/system/tray/tray_background_view.h" | 14 #include "ash/common/system/tray/tray_background_view.h" |
15 #include "base/macros.h" | 15 #include "base/macros.h" |
16 #include "ui/views/bubble/tray_bubble_view.h" | 16 #include "ui/views/bubble/tray_bubble_view.h" |
17 #include "ui/views/view.h" | 17 #include "ui/views/view.h" |
18 | 18 |
19 namespace ash { | 19 namespace ash { |
20 | 20 |
21 class KeyEventWatcher; | 21 class KeyEventWatcher; |
22 enum class LoginStatus; | 22 enum class LoginStatus; |
23 class ScreenTrayItem; | 23 class ScreenTrayItem; |
24 class SystemBubbleWrapper; | 24 class SystemBubbleWrapper; |
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
246 | 246 |
247 std::unique_ptr<KeyEventWatcher> key_event_watcher_; | 247 std::unique_ptr<KeyEventWatcher> key_event_watcher_; |
248 | 248 |
249 std::unique_ptr<ActivationObserver> activation_observer_; | 249 std::unique_ptr<ActivationObserver> activation_observer_; |
250 | 250 |
251 DISALLOW_COPY_AND_ASSIGN(SystemTray); | 251 DISALLOW_COPY_AND_ASSIGN(SystemTray); |
252 }; | 252 }; |
253 | 253 |
254 } // namespace ash | 254 } // namespace ash |
255 | 255 |
256 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ | 256 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ |
OLD | NEW |