| 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_COMMON_SYSTEM_USER_USER_VIEW_H_ | 5 #ifndef ASH_COMMON_SYSTEM_USER_USER_VIEW_H_ |
| 6 #define ASH_COMMON_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/session/session_types.h" | |
| 11 #include "ash/common/system/tray/tray_constants.h" | 10 #include "ash/common/system/tray/tray_constants.h" |
| 12 #include "ash/common/system/user/tray_user.h" | 11 #include "ash/common/system/user/tray_user.h" |
| 12 #include "ash/public/cpp/session_types.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/mouse_watcher.h" | 17 #include "ui/views/mouse_watcher.h" |
| 18 #include "ui/views/view.h" | 18 #include "ui/views/view.h" |
| 19 | 19 |
| 20 namespace gfx { | 20 namespace gfx { |
| 21 class Rect; | 21 class Rect; |
| 22 class Size; | 22 class Size; |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 // The focus manager which we use to detect focus changes. | 101 // The focus manager which we use to detect focus changes. |
| 102 views::FocusManager* focus_manager_; | 102 views::FocusManager* focus_manager_; |
| 103 | 103 |
| 104 DISALLOW_COPY_AND_ASSIGN(UserView); | 104 DISALLOW_COPY_AND_ASSIGN(UserView); |
| 105 }; | 105 }; |
| 106 | 106 |
| 107 } // namespace tray | 107 } // namespace tray |
| 108 } // namespace ash | 108 } // namespace ash |
| 109 | 109 |
| 110 #endif // ASH_COMMON_SYSTEM_USER_USER_VIEW_H_ | 110 #endif // ASH_COMMON_SYSTEM_USER_USER_VIEW_H_ |
| OLD | NEW |