| 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 "base/at_exit.h" | 5 #include "base/at_exit.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/i18n/icu_util.h" | 7 #include "base/i18n/icu_util.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "ui/aura/desktop.h" | 10 #include "ui/aura/desktop.h" |
| 11 #include "ui/aura_shell/examples/toplevel_window.h" | 11 #include "ui/aura_shell/examples/toplevel_window.h" |
| 12 #include "ui/aura_shell/launcher/launcher_types.h" | 12 #include "ui/aura_shell/launcher/launcher_types.h" |
| 13 #include "ui/aura_shell/shell.h" | 13 #include "ui/aura_shell/shell.h" |
| 14 #include "ui/aura_shell/shell_delegate.h" | 14 #include "ui/aura_shell/shell_delegate.h" |
| 15 #include "ui/aura_shell/shell_factory.h" | 15 #include "ui/aura_shell/shell_factory.h" |
| 16 #include "ui/base/resource/resource_bundle.h" | 16 #include "ui/base/resource/resource_bundle.h" |
| 17 #include "ui/base/ui_base_paths.h" | 17 #include "ui/base/ui_base_paths.h" |
| 18 #include "ui/gfx/canvas.h" | 18 #include "ui/gfx/canvas.h" |
| 19 #include "ui/gfx/compositor/test/compositor_test_support.h" | 19 #include "ui/gfx/compositor/test/compositor_test_support.h" |
| 20 #include "views/widget/widget_delegate.h" | 20 #include "ui/views/widget/widget.h" |
| 21 #include "views/widget/widget.h" | 21 #include "ui/views/widget/widget_delegate.h" |
| 22 | 22 |
| 23 namespace { | 23 namespace { |
| 24 | 24 |
| 25 class AppListWindow : public views::WidgetDelegateView { | 25 class AppListWindow : public views::WidgetDelegateView { |
| 26 public: | 26 public: |
| 27 AppListWindow() { | 27 AppListWindow() { |
| 28 } | 28 } |
| 29 | 29 |
| 30 // static | 30 // static |
| 31 static views::Widget* Create() { | 31 static views::Widget* Create() { |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 aura_shell::examples::InitWindowTypeLauncher(); | 120 aura_shell::examples::InitWindowTypeLauncher(); |
| 121 | 121 |
| 122 aura::Desktop::GetInstance()->Run(); | 122 aura::Desktop::GetInstance()->Run(); |
| 123 | 123 |
| 124 delete aura::Desktop::GetInstance(); | 124 delete aura::Desktop::GetInstance(); |
| 125 | 125 |
| 126 ui::CompositorTestSupport::Terminate(); | 126 ui::CompositorTestSupport::Terminate(); |
| 127 | 127 |
| 128 return 0; | 128 return 0; |
| 129 } | 129 } |
| OLD | NEW |