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

Side by Side Diff: ui/aura_shell/shell.cc

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/aura_shell/shelf_layout_controller.cc ('k') | ui/aura_shell/shell_unittest.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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "ui/aura/aura_switches.h" 9 #include "ui/aura/aura_switches.h"
10 #include "ui/aura/client/aura_constants.h" 10 #include "ui/aura/client/aura_constants.h"
(...skipping 13 matching lines...) Expand all
24 #include "ui/aura_shell/shelf_layout_controller.h" 24 #include "ui/aura_shell/shelf_layout_controller.h"
25 #include "ui/aura_shell/shell_delegate.h" 25 #include "ui/aura_shell/shell_delegate.h"
26 #include "ui/aura_shell/shell_factory.h" 26 #include "ui/aura_shell/shell_factory.h"
27 #include "ui/aura_shell/shell_window_ids.h" 27 #include "ui/aura_shell/shell_window_ids.h"
28 #include "ui/aura_shell/stacking_controller.h" 28 #include "ui/aura_shell/stacking_controller.h"
29 #include "ui/aura_shell/toplevel_layout_manager.h" 29 #include "ui/aura_shell/toplevel_layout_manager.h"
30 #include "ui/aura_shell/toplevel_window_event_filter.h" 30 #include "ui/aura_shell/toplevel_window_event_filter.h"
31 #include "ui/aura_shell/workspace_controller.h" 31 #include "ui/aura_shell/workspace_controller.h"
32 #include "ui/gfx/compositor/layer.h" 32 #include "ui/gfx/compositor/layer.h"
33 #include "ui/gfx/compositor/layer_animator.h" 33 #include "ui/gfx/compositor/layer_animator.h"
34 #include "views/widget/native_widget_aura.h" 34 #include "ui/views/widget/native_widget_aura.h"
35 #include "views/widget/widget.h" 35 #include "ui/views/widget/widget.h"
36 36
37 namespace aura_shell { 37 namespace aura_shell {
38 38
39 namespace { 39 namespace {
40 40
41 using views::Widget; 41 using views::Widget;
42 42
43 // Creates each of the special window containers that holds windows of various 43 // Creates each of the special window containers that holds windows of various
44 // types in the shell UI. They are added to |containers| from back to front in 44 // types in the shell UI. They are added to |containers| from back to front in
45 // the z-index. 45 // the z-index.
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 new internal::WorkspaceController(default_container)); 237 new internal::WorkspaceController(default_container));
238 workspace_controller_->SetLauncherModel(launcher_->model()); 238 workspace_controller_->SetLauncherModel(launcher_->model());
239 default_container->SetEventFilter( 239 default_container->SetEventFilter(
240 new internal::DefaultContainerEventFilter(default_container)); 240 new internal::DefaultContainerEventFilter(default_container));
241 default_container->SetLayoutManager( 241 default_container->SetLayoutManager(
242 new internal::DefaultContainerLayoutManager( 242 new internal::DefaultContainerLayoutManager(
243 workspace_controller_->workspace_manager())); 243 workspace_controller_->workspace_manager()));
244 } 244 }
245 245
246 } // namespace aura_shell 246 } // namespace aura_shell
OLDNEW
« no previous file with comments | « ui/aura_shell/shelf_layout_controller.cc ('k') | ui/aura_shell/shell_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698