| 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_SYSTEM_USER_USER_VIEW_H_ |
| 6 #define ASH_SYSTEM_USER_USER_VIEW_H_ | 6 #define ASH_SYSTEM_USER_USER_VIEW_H_ |
| 7 | 7 |
| 8 #include "ash/session_state_delegate.h" | 8 #include "ash/session/session_state_delegate.h" |
| 9 #include "ash/system/tray/tray_constants.h" | 9 #include "ash/system/tray/tray_constants.h" |
| 10 #include "ash/system/user/login_status.h" | 10 #include "ash/system/user/login_status.h" |
| 11 #include "ash/system/user/tray_user.h" | 11 #include "ash/system/user/tray_user.h" |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 #include "ui/views/controls/button/button.h" | 13 #include "ui/views/controls/button/button.h" |
| 14 #include "ui/views/layout/box_layout.h" | 14 #include "ui/views/layout/box_layout.h" |
| 15 #include "ui/views/mouse_watcher.h" | 15 #include "ui/views/mouse_watcher.h" |
| 16 #include "ui/views/view.h" | 16 #include "ui/views/view.h" |
| 17 | 17 |
| 18 namespace gfx { | 18 namespace gfx { |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 // The mouse watcher which takes care of out of window hover events. | 85 // The mouse watcher which takes care of out of window hover events. |
| 86 scoped_ptr<views::MouseWatcher> mouse_watcher_; | 86 scoped_ptr<views::MouseWatcher> mouse_watcher_; |
| 87 | 87 |
| 88 DISALLOW_COPY_AND_ASSIGN(UserView); | 88 DISALLOW_COPY_AND_ASSIGN(UserView); |
| 89 }; | 89 }; |
| 90 | 90 |
| 91 } // namespace tray | 91 } // namespace tray |
| 92 } // namespace ash | 92 } // namespace ash |
| 93 | 93 |
| 94 #endif // ASH_SYSTEM_USER_USER_VIEW_H_ | 94 #endif // ASH_SYSTEM_USER_USER_VIEW_H_ |
| OLD | NEW |