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" |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
114 // Create the message-loop here before creating the desktop. | 114 // Create the message-loop here before creating the desktop. |
115 MessageLoop message_loop(MessageLoop::TYPE_UI); | 115 MessageLoop message_loop(MessageLoop::TYPE_UI); |
116 ui::CompositorTestSupport::Initialize(); | 116 ui::CompositorTestSupport::Initialize(); |
117 | 117 |
118 aura_shell::Shell::CreateInstance(new ShellDelegateImpl); | 118 aura_shell::Shell::CreateInstance(new ShellDelegateImpl); |
119 | 119 |
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 aura::Desktop::DeleteInstance(); |
125 | 125 |
126 ui::CompositorTestSupport::Terminate(); | 126 ui::CompositorTestSupport::Terminate(); |
127 | 127 |
128 return 0; | 128 return 0; |
129 } | 129 } |
OLD | NEW |