ui/aura_shell/shell.cc - Issue 9035001: Move some more WM functionality down into ash.

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

Unified Diff: ui/aura_shell/shell.cc

Issue 9035001: Move some more WM functionality down into ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years 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 side-by-side diff with in-line comments

Download patch

Index: ui/aura_shell/shell.cc

===================================================================

--- ui/aura_shell/shell.cc (revision 115655)

+++ ui/aura_shell/shell.cc (working copy)

@@ -6,10 +6,17 @@

#include <algorithm>

+#include "ash/wm/default_container_event_filter.h"

+#include "ash/wm/default_container_layout_manager.h"

+#include "ash/wm/root_window_event_filter.h"

+#include "ash/wm/root_window_layout_manager.h"

#include "ash/wm/activation_controller.h"

#include "ash/wm/modal_container_layout_manager.h"

#include "ash/wm/shadow_controller.h"

#include "ash/wm/stacking_controller.h"

+#include "ash/wm/toplevel_layout_manager.h"

+#include "ash/wm/toplevel_window_event_filter.h"

+#include "ash/wm/workspace_controller.h"

#include "base/bind.h"

#include "base/command_line.h"

#include "ui/aura/root_window.h"

@@ -19,10 +26,6 @@

#include "ui/aura_shell/aura_shell_switches.h"

#include "ui/aura_shell/compact_layout_manager.h"

#include "ui/aura_shell/compact_status_area_layout_manager.h"

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

-#include "ui/aura_shell/default_container_layout_manager.h"

-#include "ui/aura_shell/root_window_event_filter.h"

-#include "ui/aura_shell/root_window_layout_manager.h"

#include "ui/aura_shell/drag_drop_controller.h"

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

#include "ui/aura_shell/shelf_layout_manager.h"

@@ -33,9 +36,6 @@

#include "ui/aura_shell/shell_window_ids.h"

#include "ui/aura_shell/status_area_layout_manager.h"

#include "ui/aura_shell/tooltip_controller.h"

-#include "ui/aura_shell/toplevel_layout_manager.h"

-#include "ui/aura_shell/toplevel_window_event_filter.h"

-#include "ui/aura_shell/workspace_controller.h"

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

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

#include "ui/gfx/screen.h"

« no previous file with comments | « ui/aura_shell/root_window_layout_manager.cc ('k') | ui/aura_shell/shell_accelerator_controller.cc » ('j') | no next file with comments »