ui/aura_shell/shell.cc - Issue 8428010: Cleanup: Remove ViewProp from aura build

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/shell.cc

Issue 8428010: Cleanup: Remove ViewProp from aura build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: addressed comments 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

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

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/shell.h"	5 #include "ui/aura_shell/shell.h"

6	6

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

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

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

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

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

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

13 #include "ui/aura_shell/default_container_event_filter.h"	13 #include "ui/aura_shell/default_container_event_filter.h"

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

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

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

17 #include "ui/aura_shell/shell_factory.h"	17 #include "ui/aura_shell/shell_factory.h"

18 #include "ui/aura_shell/shell_window_ids.h"	18 #include "ui/aura_shell/shell_window_ids.h"

19 #include "ui/aura_shell/workspace/workspace_controller.h"	19 #include "ui/aura_shell/workspace/workspace_controller.h"

20 #include "ui/base/view_prop.h"

21 #include "ui/gfx/compositor/layer.h"	20 #include "ui/gfx/compositor/layer.h"

22 #include "ui/gfx/compositor/layer_animator.h"	21 #include "ui/gfx/compositor/layer_animator.h"

23 #include "views/widget/native_widget_aura.h"	22 #include "views/widget/native_widget_aura.h"

24 #include "views/widget/widget.h"	23 #include "views/widget/widget.h"

25	24

26 namespace aura_shell {	25 namespace aura_shell {

27	26

28 namespace {	27 namespace {

29	28

30 // The right/left margin of work area in the screen.	29 // The right/left margin of work area in the screen.

(...skipping 142 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
173 }	172 }

174	173

175 aura::Window* Shell::GetTopmostWindowToActivate(aura::Window* ignore) const {	174 aura::Window* Shell::GetTopmostWindowToActivate(aura::Window* ignore) const {

176 const aura::ToplevelWindowContainer* container =	175 const aura::ToplevelWindowContainer* container =

177 GetContainer(internal::kShellWindowId_DefaultContainer)->	176 GetContainer(internal::kShellWindowId_DefaultContainer)->

178 AsToplevelWindowContainer();	177 AsToplevelWindowContainer();

179 return container->GetTopmostWindowToActivate(ignore);	178 return container->GetTopmostWindowToActivate(ignore);

180 }	179 }

181	180

182 } // namespace aura_shell	181 } // namespace aura_shell

OLD	NEW