| 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/root_window.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 "ui/views/widget/widget.h" | 20 #include "ui/views/widget/widget.h" |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 int main(int argc, char** argv) { | 106 int main(int argc, char** argv) { |
| 107 CommandLine::Init(argc, argv); | 107 CommandLine::Init(argc, argv); |
| 108 | 108 |
| 109 // The exit manager is in charge of calling the dtors of singleton objects. | 109 // The exit manager is in charge of calling the dtors of singleton objects. |
| 110 base::AtExitManager exit_manager; | 110 base::AtExitManager exit_manager; |
| 111 | 111 |
| 112 ui::RegisterPathProvider(); | 112 ui::RegisterPathProvider(); |
| 113 icu_util::Initialize(); | 113 icu_util::Initialize(); |
| 114 ResourceBundle::InitSharedInstance("en-US"); | 114 ResourceBundle::InitSharedInstance("en-US"); |
| 115 | 115 |
| 116 // Create the message-loop here before creating the desktop. | 116 // Create the message-loop here before creating the root window. |
| 117 MessageLoop message_loop(MessageLoop::TYPE_UI); | 117 MessageLoop message_loop(MessageLoop::TYPE_UI); |
| 118 ui::CompositorTestSupport::Initialize(); | 118 ui::CompositorTestSupport::Initialize(); |
| 119 | 119 |
| 120 aura_shell::Shell::CreateInstance(new ShellDelegateImpl); | 120 aura_shell::Shell::CreateInstance(new ShellDelegateImpl); |
| 121 | 121 |
| 122 aura_shell::examples::InitWindowTypeLauncher(); | 122 aura_shell::examples::InitWindowTypeLauncher(); |
| 123 | 123 |
| 124 aura::Desktop::GetInstance()->Run(); | 124 aura::RootWindow::GetInstance()->Run(); |
| 125 | 125 |
| 126 aura::Desktop::DeleteInstance(); | 126 aura::RootWindow::DeleteInstance(); |
| 127 | 127 |
| 128 ui::CompositorTestSupport::Terminate(); | 128 ui::CompositorTestSupport::Terminate(); |
| 129 | 129 |
| 130 return 0; | 130 return 0; |
| 131 } | 131 } |
| OLD | NEW |