trunk/src/ash/wm/stacking_controller.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/stacking_controller.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/power_button_controller.cc ('k') | trunk/src/ash/wm/system_modal_container_layout_manager.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/stacking_controller.h"	5 #include "ash/wm/stacking_controller.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/shell.h"	9 #include "ash/shell.h"

10 #include "ash/shell_window_ids.h"	10 #include "ash/shell_window_ids.h"

11 #include "ash/wm/always_on_top_controller.h"	11 #include "ash/wm/always_on_top_controller.h"

12 #include "ash/wm/coordinate_conversion.h"	12 #include "ash/wm/coordinate_conversion.h"

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

14 #include "ui/aura/client/aura_constants.h"	14 #include "ui/aura/client/aura_constants.h"

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

16 #include "ui/aura/window_event_dispatcher.h"	16 #include "ui/aura/window_event_dispatcher.h"

17 #include "ui/base/ui_base_types.h"	17 #include "ui/base/ui_base_types.h"

18 #include "ui/wm/core/window_util.h"	18 #include "ui/wm/core/window_util.h"

(...skipping 112 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
131 if (window_container_id < kShellWindowId_LockScreenContainer) {	131 if (window_container_id < kShellWindowId_LockScreenContainer) {

132 container = GetContainerById(root, kShellWindowId_SystemModalContainer);	132 container = GetContainerById(root, kShellWindowId_SystemModalContainer);

133 } else {	133 } else {

134 container = GetContainerById(root, kShellWindowId_LockSystemModalContainer);	134 container = GetContainerById(root, kShellWindowId_LockSystemModalContainer);

135 }	135 }

136	136

137 return container;	137 return container;

138 }	138 }

139	139

140 } // namespace ash	140 } // namespace ash

OLD	NEW