OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <stdio.h> | 5 #include <stdio.h> |
6 #include <string> | 6 #include <string> |
7 | 7 |
8 #include "base/at_exit.h" | 8 #include "base/at_exit.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
11 #include "mojo/examples/aura_demo/demo_screen.h" | 11 #include "mojo/examples/aura_demo/demo_screen.h" |
12 #include "mojo/examples/aura_demo/window_tree_host_mojo.h" | 12 #include "mojo/examples/aura_demo/window_tree_host_mojo.h" |
13 #include "mojo/public/bindings/allocation_scope.h" | 13 #include "mojo/public/bindings/allocation_scope.h" |
| 14 #include "mojo/public/c/system/core.h" |
| 15 #include "mojo/public/c/system/macros.h" |
14 #include "mojo/public/gles2/gles2_cpp.h" | 16 #include "mojo/public/gles2/gles2_cpp.h" |
15 #include "mojo/public/shell/application.h" | 17 #include "mojo/public/shell/application.h" |
16 #include "mojo/public/shell/shell.mojom.h" | 18 #include "mojo/public/shell/shell.mojom.h" |
17 #include "mojo/public/system/core.h" | |
18 #include "mojo/public/system/macros.h" | |
19 #include "mojo/services/native_viewport/native_viewport.mojom.h" | 19 #include "mojo/services/native_viewport/native_viewport.mojom.h" |
20 #include "ui/aura/client/default_capture_client.h" | 20 #include "ui/aura/client/default_capture_client.h" |
21 #include "ui/aura/client/window_tree_client.h" | 21 #include "ui/aura/client/window_tree_client.h" |
22 #include "ui/aura/env.h" | 22 #include "ui/aura/env.h" |
23 #include "ui/aura/window.h" | 23 #include "ui/aura/window.h" |
24 #include "ui/aura/window_delegate.h" | 24 #include "ui/aura/window_delegate.h" |
25 #include "ui/base/hit_test.h" | 25 #include "ui/base/hit_test.h" |
26 #include "ui/gfx/canvas.h" | 26 #include "ui/gfx/canvas.h" |
27 | 27 |
28 #if defined(WIN32) | 28 #if defined(WIN32) |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
184 | 184 |
185 // TODO(beng): This crashes in a DCHECK on X11 because this thread's | 185 // TODO(beng): This crashes in a DCHECK on X11 because this thread's |
186 // MessageLoop is not of TYPE_UI. I think we need a way to build | 186 // MessageLoop is not of TYPE_UI. I think we need a way to build |
187 // Aura that doesn't define platform-specific stuff. | 187 // Aura that doesn't define platform-specific stuff. |
188 aura::Env::CreateInstance(); | 188 aura::Env::CreateInstance(); |
189 mojo::examples::AuraDemo app(shell_handle); | 189 mojo::examples::AuraDemo app(shell_handle); |
190 loop.Run(); | 190 loop.Run(); |
191 | 191 |
192 return MOJO_RESULT_OK; | 192 return MOJO_RESULT_OK; |
193 } | 193 } |
OLD | NEW |