| 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/aura/screen_mojo.h" | 11 #include "mojo/aura/screen_mojo.h" |
| 12 #include "mojo/aura/window_tree_host_mojo.h" | 12 #include "mojo/aura/window_tree_host_mojo.h" |
| 13 #include "mojo/public/cpp/bindings/allocation_scope.h" | |
| 14 #include "mojo/public/cpp/gles2/gles2.h" | 13 #include "mojo/public/cpp/gles2/gles2.h" |
| 15 #include "mojo/public/cpp/shell/application.h" | 14 #include "mojo/public/cpp/shell/application.h" |
| 16 #include "mojo/public/cpp/system/core.h" | 15 #include "mojo/public/cpp/system/core.h" |
| 17 #include "mojo/public/interfaces/shell/shell.mojom.h" | 16 #include "mojo/public/interfaces/shell/shell.mojom.h" |
| 18 #include "mojo/services/native_viewport/native_viewport.mojom.h" | 17 #include "mojo/services/native_viewport/native_viewport.mojom.h" |
| 19 #include "ui/aura/client/default_capture_client.h" | 18 #include "ui/aura/client/default_capture_client.h" |
| 20 #include "ui/aura/client/window_tree_client.h" | 19 #include "ui/aura/client/window_tree_client.h" |
| 21 #include "ui/aura/env.h" | 20 #include "ui/aura/env.h" |
| 22 #include "ui/aura/window.h" | 21 #include "ui/aura/window.h" |
| 23 #include "ui/aura/window_delegate.h" | 22 #include "ui/aura/window_delegate.h" |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 | 183 |
| 185 // TODO(beng): This crashes in a DCHECK on X11 because this thread's | 184 // 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 | 185 // MessageLoop is not of TYPE_UI. I think we need a way to build |
| 187 // Aura that doesn't define platform-specific stuff. | 186 // Aura that doesn't define platform-specific stuff. |
| 188 aura::Env::CreateInstance(true); | 187 aura::Env::CreateInstance(true); |
| 189 mojo::examples::AuraDemo app(shell_handle); | 188 mojo::examples::AuraDemo app(shell_handle); |
| 190 loop.Run(); | 189 loop.Run(); |
| 191 | 190 |
| 192 return MOJO_RESULT_OK; | 191 return MOJO_RESULT_OK; |
| 193 } | 192 } |
| OLD | NEW |