trunk/src/ash/wm/gestures/shelf_gesture_handler.cc - 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/wm/gestures/shelf_gesture_handler.cc

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/wm/event_client_impl.cc ('k') | trunk/src/ash/wm/lock_state_controller_unittest.cc » ('j') | no next file with comments »

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 #include "ash/wm/gestures/shelf_gesture_handler.h"	5 #include "ash/wm/gestures/shelf_gesture_handler.h"

6	6

7 #include "ash/root_window_controller.h"	7 #include "ash/root_window_controller.h"

8 #include "ash/session/session_state_delegate.h"	8 #include "ash/session_state_delegate.h"

9 #include "ash/shelf/shelf_layout_manager.h"	9 #include "ash/shelf/shelf_layout_manager.h"

10 #include "ash/shelf/shelf_types.h"	10 #include "ash/shelf/shelf_types.h"

11 #include "ash/shelf/shelf_widget.h"	11 #include "ash/shelf/shelf_widget.h"

12 #include "ash/shell.h"	12 #include "ash/shell.h"

13 #include "ash/system/status_area_widget.h"	13 #include "ash/system/status_area_widget.h"

14 #include "ash/wm/gestures/tray_gesture_handler.h"	14 #include "ash/wm/gestures/tray_gesture_handler.h"

15 #include "ash/wm/window_state.h"	15 #include "ash/wm/window_state.h"

16 #include "ash/wm/window_util.h"	16 #include "ash/wm/window_util.h"

17 #include "ui/aura/window.h"	17 #include "ui/aura/window.h"

18 #include "ui/compositor/layer.h"	18 #include "ui/compositor/layer.h"

(...skipping 67 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
86 shelf->CompleteGestureDrag(event);	86 shelf->CompleteGestureDrag(event);

87 return true;	87 return true;

88 }	88 }

89	89

90 // Unexpected event. Reset the state and let the event fall through.	90 // Unexpected event. Reset the state and let the event fall through.

91 shelf->CancelGestureDrag();	91 shelf->CancelGestureDrag();

92 return false;	92 return false;

93 }	93 }

94	94

95 } // namespace ash	95 } // namespace ash

OLD	NEW