| 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/compositor/compositor_test_support.h" | 18 #include "ui/gfx/compositor/test/compositor_test_support.h" |
| 19 | 19 |
| 20 namespace { | 20 namespace { |
| 21 | 21 |
| 22 class ShellDelegateImpl : public aura_shell::ShellDelegate { | 22 class ShellDelegateImpl : public aura_shell::ShellDelegate { |
| 23 public: | 23 public: |
| 24 ShellDelegateImpl() { | 24 ShellDelegateImpl() { |
| 25 } | 25 } |
| 26 | 26 |
| 27 virtual void CreateNewWindow() OVERRIDE { | 27 virtual void CreateNewWindow() OVERRIDE { |
| 28 aura_shell::examples::ToplevelWindow::CreateParams create_params; | 28 aura_shell::examples::ToplevelWindow::CreateParams create_params; |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 aura_shell::examples::InitWindowTypeLauncher(); | 81 aura_shell::examples::InitWindowTypeLauncher(); |
| 82 | 82 |
| 83 aura::Desktop::GetInstance()->Run(); | 83 aura::Desktop::GetInstance()->Run(); |
| 84 | 84 |
| 85 delete aura::Desktop::GetInstance(); | 85 delete aura::Desktop::GetInstance(); |
| 86 | 86 |
| 87 ui::CompositorTestSupport::Terminate(); | 87 ui::CompositorTestSupport::Terminate(); |
| 88 | 88 |
| 89 return 0; | 89 return 0; |
| 90 } | 90 } |
| OLD | NEW |