Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side 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 8 years, 12 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 | « ui/aura_shell/root_window_layout_manager.cc ('k') | ui/aura_shell/shell_accelerator_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/wm/default_container_event_filter.h"
10 #include "ash/wm/default_container_layout_manager.h"
11 #include "ash/wm/root_window_event_filter.h"
12 #include "ash/wm/root_window_layout_manager.h"
9 #include "ash/wm/activation_controller.h" 13 #include "ash/wm/activation_controller.h"
10 #include "ash/wm/modal_container_layout_manager.h" 14 #include "ash/wm/modal_container_layout_manager.h"
11 #include "ash/wm/shadow_controller.h" 15 #include "ash/wm/shadow_controller.h"
12 #include "ash/wm/stacking_controller.h" 16 #include "ash/wm/stacking_controller.h"
17 #include "ash/wm/toplevel_layout_manager.h"
18 #include "ash/wm/toplevel_window_event_filter.h"
19 #include "ash/wm/workspace_controller.h"
13 #include "base/bind.h" 20 #include "base/bind.h"
14 #include "base/command_line.h" 21 #include "base/command_line.h"
15 #include "ui/aura/root_window.h" 22 #include "ui/aura/root_window.h"
16 #include "ui/aura/layout_manager.h" 23 #include "ui/aura/layout_manager.h"
17 #include "ui/aura/window.h" 24 #include "ui/aura/window.h"
18 #include "ui/aura_shell/app_list.h" 25 #include "ui/aura_shell/app_list.h"
19 #include "ui/aura_shell/aura_shell_switches.h" 26 #include "ui/aura_shell/aura_shell_switches.h"
20 #include "ui/aura_shell/compact_layout_manager.h" 27 #include "ui/aura_shell/compact_layout_manager.h"
21 #include "ui/aura_shell/compact_status_area_layout_manager.h" 28 #include "ui/aura_shell/compact_status_area_layout_manager.h"
22 #include "ui/aura_shell/default_container_event_filter.h"
23 #include "ui/aura_shell/default_container_layout_manager.h"
24 #include "ui/aura_shell/root_window_event_filter.h"
25 #include "ui/aura_shell/root_window_layout_manager.h"
26 #include "ui/aura_shell/drag_drop_controller.h" 29 #include "ui/aura_shell/drag_drop_controller.h"
27 #include "ui/aura_shell/launcher/launcher.h" 30 #include "ui/aura_shell/launcher/launcher.h"
28 #include "ui/aura_shell/shelf_layout_manager.h" 31 #include "ui/aura_shell/shelf_layout_manager.h"
29 #include "ui/aura_shell/shell_accelerator_controller.h" 32 #include "ui/aura_shell/shell_accelerator_controller.h"
30 #include "ui/aura_shell/shell_accelerator_filter.h" 33 #include "ui/aura_shell/shell_accelerator_filter.h"
31 #include "ui/aura_shell/shell_delegate.h" 34 #include "ui/aura_shell/shell_delegate.h"
32 #include "ui/aura_shell/shell_factory.h" 35 #include "ui/aura_shell/shell_factory.h"
33 #include "ui/aura_shell/shell_window_ids.h" 36 #include "ui/aura_shell/shell_window_ids.h"
34 #include "ui/aura_shell/status_area_layout_manager.h" 37 #include "ui/aura_shell/status_area_layout_manager.h"
35 #include "ui/aura_shell/tooltip_controller.h" 38 #include "ui/aura_shell/tooltip_controller.h"
36 #include "ui/aura_shell/toplevel_layout_manager.h"
37 #include "ui/aura_shell/toplevel_window_event_filter.h"
38 #include "ui/aura_shell/workspace_controller.h"
39 #include "ui/gfx/compositor/layer.h" 39 #include "ui/gfx/compositor/layer.h"
40 #include "ui/gfx/compositor/layer_animator.h" 40 #include "ui/gfx/compositor/layer_animator.h"
41 #include "ui/gfx/screen.h" 41 #include "ui/gfx/screen.h"
42 #include "ui/gfx/size.h" 42 #include "ui/gfx/size.h"
43 #include "ui/views/widget/native_widget_aura.h" 43 #include "ui/views/widget/native_widget_aura.h"
44 #include "ui/views/widget/widget.h" 44 #include "ui/views/widget/widget.h"
45 45
46 namespace aura_shell { 46 namespace aura_shell {
47 47
48 namespace { 48 namespace {
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 new internal::WorkspaceController(default_container)); 360 new internal::WorkspaceController(default_container));
361 workspace_controller_->SetLauncherModel(launcher_->model()); 361 workspace_controller_->SetLauncherModel(launcher_->model());
362 default_container->SetEventFilter( 362 default_container->SetEventFilter(
363 new internal::DefaultContainerEventFilter(default_container)); 363 new internal::DefaultContainerEventFilter(default_container));
364 default_container->SetLayoutManager( 364 default_container->SetLayoutManager(
365 new internal::DefaultContainerLayoutManager( 365 new internal::DefaultContainerLayoutManager(
366 workspace_controller_->workspace_manager())); 366 workspace_controller_->workspace_manager()));
367 } 367 }
368 368
369 } // namespace aura_shell 369 } // namespace aura_shell
OLDNEW
« 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 »

Powered by Google App Engine
This is Rietveld 408576698