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 "ash/shell/toplevel_window.h" | 5 #include "ash/shell/toplevel_window.h" |
| 6 #include "ash/wm/window_util.h" |
6 #include "base/at_exit.h" | 7 #include "base/at_exit.h" |
7 #include "base/command_line.h" | 8 #include "base/command_line.h" |
8 #include "base/i18n/icu_util.h" | 9 #include "base/i18n/icu_util.h" |
9 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
10 #include "base/message_loop.h" | 11 #include "base/message_loop.h" |
11 #include "ui/aura/root_window.h" | 12 #include "ui/aura/root_window.h" |
12 #include "ui/aura_shell/launcher/launcher_types.h" | 13 #include "ui/aura_shell/launcher/launcher_types.h" |
13 #include "ui/aura_shell/shell.h" | 14 #include "ui/aura_shell/shell.h" |
14 #include "ui/aura_shell/shell_delegate.h" | 15 #include "ui/aura_shell/shell_delegate.h" |
15 #include "ui/aura_shell/shell_factory.h" | 16 #include "ui/aura_shell/shell_factory.h" |
16 #include "ui/aura_shell/window_util.h" | |
17 #include "ui/base/resource/resource_bundle.h" | 17 #include "ui/base/resource/resource_bundle.h" |
18 #include "ui/base/ui_base_paths.h" | 18 #include "ui/base/ui_base_paths.h" |
19 #include "ui/gfx/canvas.h" | 19 #include "ui/gfx/canvas.h" |
20 #include "ui/gfx/compositor/test/compositor_test_support.h" | 20 #include "ui/gfx/compositor/test/compositor_test_support.h" |
21 #include "ui/views/widget/widget.h" | 21 #include "ui/views/widget/widget.h" |
22 #include "ui/views/widget/widget_delegate.h" | 22 #include "ui/views/widget/widget_delegate.h" |
23 | 23 |
24 namespace { | 24 namespace { |
25 | 25 |
26 class AppListWindow : public views::WidgetDelegateView { | 26 class AppListWindow : public views::WidgetDelegateView { |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 aura::RootWindow::GetInstance()->Run(); | 125 aura::RootWindow::GetInstance()->Run(); |
126 | 126 |
127 aura_shell::Shell::DeleteInstance(); | 127 aura_shell::Shell::DeleteInstance(); |
128 | 128 |
129 aura::RootWindow::DeleteInstance(); | 129 aura::RootWindow::DeleteInstance(); |
130 | 130 |
131 ui::CompositorTestSupport::Terminate(); | 131 ui::CompositorTestSupport::Terminate(); |
132 | 132 |
133 return 0; | 133 return 0; |
134 } | 134 } |
OLD | NEW |