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/root_window.h" | 10 #include "ui/aura/root_window.h" |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 // Create the message-loop here before creating the root window. | 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::RootWindow::GetInstance()->Run(); | 124 aura::RootWindow::GetInstance()->Run(); |
125 | 125 |
| 126 aura_shell::Shell::DeleteInstance(); |
| 127 |
126 aura::RootWindow::DeleteInstance(); | 128 aura::RootWindow::DeleteInstance(); |
127 | 129 |
128 ui::CompositorTestSupport::Terminate(); | 130 ui::CompositorTestSupport::Terminate(); |
129 | 131 |
130 return 0; | 132 return 0; |
131 } | 133 } |
OLD | NEW |