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

6	6

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

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

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

10 #include "ash/wm/system_modal_container_event_filter.h"	10 #include "ash/wm/system_modal_container_event_filter.h"

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

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

13 #include "base/bind.h"	13 #include "base/bind.h"

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

15 #include "ui/aura/client/capture_client.h"	15 #include "ui/aura/client/capture_client.h"

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

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

(...skipping 239 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
257 DCHECK_EQ(valid_bounds.x(), bounds.x());	257 DCHECK_EQ(valid_bounds.x(), bounds.x());

258 DCHECK_EQ(valid_bounds.right(), bounds.right());	258 DCHECK_EQ(valid_bounds.right(), bounds.right());

259 DCHECK_LT(valid_bounds.y(), bounds.y());	259 DCHECK_LT(valid_bounds.y(), bounds.y());

260 valid_bounds.set_height(bounds.y() - valid_bounds.y());	260 valid_bounds.set_height(bounds.y() - valid_bounds.y());

261 }	261 }

262 }	262 }

263 return valid_bounds;	263 return valid_bounds;

264 }	264 }

265	265

266 } // namespace ash	266 } // namespace ash

OLD	NEW