| 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/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 mojo::GLES2Initializer gles2; | 260 mojo::GLES2Initializer gles2; |
| 261 | 261 |
| 262 // TODO(beng): This crashes in a DCHECK on X11 because this thread's | 262 // TODO(beng): This crashes in a DCHECK on X11 because this thread's |
| 263 // MessageLoop is not of TYPE_UI. I think we need a way to build | 263 // MessageLoop is not of TYPE_UI. I think we need a way to build |
| 264 // Aura that doesn't define platform-specific stuff. | 264 // Aura that doesn't define platform-specific stuff. |
| 265 aura::Env::CreateInstance(); | 265 aura::Env::CreateInstance(); |
| 266 mojo::examples::Launcher launcher( | 266 mojo::examples::Launcher launcher( |
| 267 mojo::MakeScopedHandle(mojo::MessagePipeHandle(shell_handle)).Pass()); | 267 mojo::MakeScopedHandle(mojo::MessagePipeHandle(shell_handle)).Pass()); |
| 268 loop.Run(); | 268 loop.Run(); |
| 269 | 269 |
| 270 MojoGLES2Terminate(); | |
| 271 return MOJO_RESULT_OK; | 270 return MOJO_RESULT_OK; |
| 272 } | 271 } |
| OLD | NEW |