OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/macros.h" | 5 #include "base/macros.h" |
6 #include "base/threading/platform_thread.h" | 6 #include "base/threading/platform_thread.h" |
7 #include "examples/surfaces_app/child_gl_impl.h" | 7 #include "examples/surfaces_app/child_gl_impl.h" |
8 #include "mojo/application/application_runner_chromium.h" | 8 #include "mojo/application/application_runner_chromium.h" |
9 #include "mojo/public/c/system/main.h" | 9 #include "mojo/public/c/system/main.h" |
10 #include "mojo/public/cpp/application/application_connection.h" | 10 #include "mojo/public/cpp/application/application_connection.h" |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 private: | 47 private: |
48 ApplicationConnection* surfaces_service_connection_; | 48 ApplicationConnection* surfaces_service_connection_; |
49 GpuPtr gpu_service_; | 49 GpuPtr gpu_service_; |
50 | 50 |
51 DISALLOW_COPY_AND_ASSIGN(ChildGLApp); | 51 DISALLOW_COPY_AND_ASSIGN(ChildGLApp); |
52 }; | 52 }; |
53 | 53 |
54 } // namespace examples | 54 } // namespace examples |
55 } // namespace mojo | 55 } // namespace mojo |
56 | 56 |
57 MojoResult MojoMain(MojoHandle shell_handle) { | 57 MojoResult MojoMain(MojoHandle application_request) { |
58 mojo::ApplicationRunnerChromium runner(new mojo::examples::ChildGLApp); | 58 mojo::ApplicationRunnerChromium runner(new mojo::examples::ChildGLApp); |
59 return runner.Run(shell_handle); | 59 return runner.Run(application_request); |
60 } | 60 } |
OLD | NEW |