OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_USER_USER_VIEW_H_ | 5 #ifndef ASH_COMMON_SYSTEM_USER_USER_VIEW_H_ |
6 #define ASH_SYSTEM_USER_USER_VIEW_H_ | 6 #define ASH_COMMON_SYSTEM_USER_USER_VIEW_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 | 9 |
| 10 #include "ash/common/system/tray/tray_constants.h" |
| 11 #include "ash/common/system/user/tray_user.h" |
10 #include "ash/public/cpp/session_types.h" | 12 #include "ash/public/cpp/session_types.h" |
11 #include "ash/system/tray/tray_constants.h" | |
12 #include "ash/system/user/tray_user.h" | |
13 #include "base/macros.h" | 13 #include "base/macros.h" |
14 #include "ui/views/controls/button/button.h" | 14 #include "ui/views/controls/button/button.h" |
15 #include "ui/views/focus/focus_manager.h" | 15 #include "ui/views/focus/focus_manager.h" |
16 #include "ui/views/layout/box_layout.h" | 16 #include "ui/views/layout/box_layout.h" |
17 #include "ui/views/view.h" | 17 #include "ui/views/view.h" |
18 | 18 |
19 namespace gfx { | 19 namespace gfx { |
20 class Rect; | 20 class Rect; |
21 } | 21 } |
22 | 22 |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 | 86 |
87 // The focus manager which we use to detect focus changes. | 87 // The focus manager which we use to detect focus changes. |
88 views::FocusManager* focus_manager_; | 88 views::FocusManager* focus_manager_; |
89 | 89 |
90 DISALLOW_COPY_AND_ASSIGN(UserView); | 90 DISALLOW_COPY_AND_ASSIGN(UserView); |
91 }; | 91 }; |
92 | 92 |
93 } // namespace tray | 93 } // namespace tray |
94 } // namespace ash | 94 } // namespace ash |
95 | 95 |
96 #endif // ASH_SYSTEM_USER_USER_VIEW_H_ | 96 #endif // ASH_COMMON_SYSTEM_USER_USER_VIEW_H_ |
OLD | NEW |