trunk/src/ash/system/user/user_view.h - Issue 260783002: Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..."

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: trunk/src/ash/system/user/user_view.h

Issue 260783002: Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « trunk/src/ash/system/user/user_card_view.cc ('k') | trunk/src/ash/system/user/user_view.cc » ('j') | no next file with comments »

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/session_state_delegate.h"	8 #include "ash/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