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 "mojo/application/application_runner_chromium.h" | 7 #include "mojo/application/application_runner_chromium.h" |
8 #include "mojo/examples/surfaces_app/child_gl_impl.h" | 8 #include "mojo/examples/surfaces_app/child_gl_impl.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" |
11 #include "mojo/public/cpp/application/application_delegate.h" | 11 #include "mojo/public/cpp/application/application_delegate.h" |
12 #include "mojo/public/cpp/application/application_impl.h" | 12 #include "mojo/public/cpp/application/application_impl.h" |
13 #include "mojo/public/cpp/bindings/string.h" | 13 #include "mojo/public/cpp/bindings/string.h" |
14 #include "mojo/services/public/interfaces/gpu/gpu.mojom.h" | 14 #include "mojo/services/public/interfaces/gpu/gpu.mojom.h" |
15 | 15 |
16 namespace mojo { | 16 namespace mojo { |
17 namespace examples { | 17 namespace examples { |
18 | 18 |
19 class ChildGLApp : public ApplicationDelegate, public InterfaceFactory<Child> { | 19 class ChildGLApp : public ApplicationDelegate, public InterfaceFactory<Child> { |
20 public: | 20 public: |
21 ChildGLApp() {} | 21 ChildGLApp() {} |
22 virtual ~ChildGLApp() {} | 22 virtual ~ChildGLApp() {} |
23 | 23 |
24 virtual void Initialize(ApplicationImpl* app) override { | 24 virtual void Initialize(ApplicationImpl* app) override { |
25 surfaces_service_connection_ = | 25 surfaces_service_connection_ = |
26 app->ConnectToApplication("mojo:mojo_surfaces_service"); | 26 app->ConnectToApplication("mojo:surfaces_service"); |
27 // TODO(jamesr): Should be mojo:mojo_gpu_service | 27 // TODO(jamesr): Should be mojo:gpu_service |
28 app->ConnectToService("mojo:mojo_native_viewport_service", &gpu_service_); | 28 app->ConnectToService("mojo:native_viewport_service", &gpu_service_); |
29 } | 29 } |
30 | 30 |
31 // ApplicationDelegate implementation. | 31 // ApplicationDelegate implementation. |
32 virtual bool ConfigureIncomingConnection( | 32 virtual bool ConfigureIncomingConnection( |
33 ApplicationConnection* connection) override { | 33 ApplicationConnection* connection) override { |
34 connection->AddService(this); | 34 connection->AddService(this); |
35 return true; | 35 return true; |
36 } | 36 } |
37 | 37 |
38 // InterfaceFactory<Child> implementation. | 38 // InterfaceFactory<Child> implementation. |
(...skipping 13 matching lines...) Expand all Loading... |
52 DISALLOW_COPY_AND_ASSIGN(ChildGLApp); | 52 DISALLOW_COPY_AND_ASSIGN(ChildGLApp); |
53 }; | 53 }; |
54 | 54 |
55 } // namespace examples | 55 } // namespace examples |
56 } // namespace mojo | 56 } // namespace mojo |
57 | 57 |
58 MojoResult MojoMain(MojoHandle shell_handle) { | 58 MojoResult MojoMain(MojoHandle shell_handle) { |
59 mojo::ApplicationRunnerChromium runner(new mojo::examples::ChildGLApp); | 59 mojo::ApplicationRunnerChromium runner(new mojo::examples::ChildGLApp); |
60 return runner.Run(shell_handle); | 60 return runner.Run(shell_handle); |
61 } | 61 } |
OLD | NEW |