ui/aura_shell/default_container_layout_manager.cc - Issue 8547015: Revert 110949 - views: Move widget/ directory to ui/views.

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: ui/aura_shell/default_container_layout_manager.cc

Issue 8547015: Revert 110949 - views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 "ui/aura_shell/default_container_layout_manager.h"	5 #include "ui/aura_shell/default_container_layout_manager.h"

6	6

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

8 #include "ui/aura/desktop.h"	8 #include "ui/aura/desktop.h"

9 #include "ui/aura/event.h"	9 #include "ui/aura/event.h"

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

10 #include "ui/aura/screen_aura.h"	11 #include "ui/aura/screen_aura.h"

11 #include "ui/aura/window.h"	12 #include "ui/aura/window_types.h"

12 #include "ui/aura/window_observer.h"	13 #include "ui/aura/window_observer.h"

13 #include "ui/aura/window_types.h"

14 #include "ui/aura_shell/property_util.h"	14 #include "ui/aura_shell/property_util.h"

15 #include "ui/aura_shell/show_state_controller.h"	15 #include "ui/aura_shell/show_state_controller.h"

16 #include "ui/aura_shell/workspace/workspace.h"	16 #include "ui/aura_shell/workspace/workspace.h"

17 #include "ui/aura_shell/workspace/workspace_manager.h"	17 #include "ui/aura_shell/workspace/workspace_manager.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 "views/widget/native_widget_aura.h"

21	21

22 namespace aura_shell {	22 namespace aura_shell {

23 namespace internal {	23 namespace internal {

24	24

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

26 // DefaultContainerLayoutManager, public:	26 // DefaultContainerLayoutManager, public:

27	27

28 DefaultContainerLayoutManager::DefaultContainerLayoutManager(	28 DefaultContainerLayoutManager::DefaultContainerLayoutManager(

29 WorkspaceManager* workspace_manager)	29 WorkspaceManager* workspace_manager)

30 : workspace_manager_(workspace_manager),	30 : workspace_manager_(workspace_manager),

(...skipping 148 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
179 adjusted_bounds = workspace->bounds();	179 adjusted_bounds = workspace->bounds();

180 // Don't	180 // Don't

181 if (child->GetTargetBounds() == adjusted_bounds)	181 if (child->GetTargetBounds() == adjusted_bounds)

182 return;	182 return;

183 }	183 }

184 SetChildBoundsDirect(child, adjusted_bounds);	184 SetChildBoundsDirect(child, adjusted_bounds);

185 }	185 }

186	186

187 } // namespace internal	187 } // namespace internal

188 } // namespace aura_shell	188 } // namespace aura_shell

OLD	NEW

« no previous file with comments | « chrome/test/base/view_event_test_base.cc ('k') | ui/aura_shell/default_container_layout_manager_unittest.cc » ('j') | no next file with comments »