ash/wm/workspace/workspace_layout_manager.cc - Issue 9616045: Aura/Ash split: Move ScreenAura to ash::ScreenAsh.

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: ash/wm/workspace/workspace_layout_manager.cc

Issue 9616045: Aura/Ash split: Move ScreenAura to ash::ScreenAsh. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Use a separate aura::TestScreen in tests instead, partially reverting to patchset 2 Created 8 years, 9 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

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

6	6

	7 #include "ash/screen_ash.h"

7 #include "ash/wm/property_util.h"	8 #include "ash/wm/property_util.h"

8 #include "ash/wm/window_util.h"	9 #include "ash/wm/window_util.h"

9 #include "ash/wm/workspace/workspace.h"	10 #include "ash/wm/workspace/workspace.h"

10 #include "ash/wm/workspace/workspace_manager.h"	11 #include "ash/wm/workspace/workspace_manager.h"

11 #include "ash/wm/workspace/workspace_window_resizer.h"	12 #include "ash/wm/workspace/workspace_window_resizer.h"

12 #include "ui/aura/client/aura_constants.h"	13 #include "ui/aura/client/aura_constants.h"

13 #include "ui/aura/event.h"	14 #include "ui/aura/event.h"

14 #include "ui/aura/root_window.h"	15 #include "ui/aura/root_window.h"

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

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

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

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

19 #include "ui/gfx/rect.h"	19 #include "ui/gfx/rect.h"

20 #include "ui/views/widget/native_widget_aura.h"	20 #include "ui/views/widget/native_widget_aura.h"

21	21

22 namespace ash {	22 namespace ash {

23 namespace internal {	23 namespace internal {

24	24

25 ////////////////////////////////////////////////////////////////////////////////	25 ////////////////////////////////////////////////////////////////////////////////

(...skipping 68 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
94 } else if (key == ash::kWindowTrackedByWorkspaceSplitPropKey &&	94 } else if (key == ash::kWindowTrackedByWorkspaceSplitPropKey &&

95 ash::GetTrackedByWorkspace(window)) {	95 ash::GetTrackedByWorkspace(window)) {

96 // We currently don't need to support transitioning from true to false, so	96 // We currently don't need to support transitioning from true to false, so

97 // we ignore it.	97 // we ignore it.

98 workspace_manager_->AddWindow(window);	98 workspace_manager_->AddWindow(window);

99 }	99 }

100 }	100 }

101	101

102 } // namespace internal	102 } // namespace internal

103 } // namespace ash	103 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/wm/workspace/workspace_event_filter.cc ('k') | ash/wm/workspace/workspace_manager.cc » ('j') | no next file with comments »