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/threading/platform_thread.h" | 5 #include "base/threading/platform_thread.h" |
6 #include "mojo/examples/surfaces_app/child_gl_impl.h" | 6 #include "mojo/examples/surfaces_app/child_gl_impl.h" |
7 #include "mojo/public/c/system/main.h" | |
7 #include "mojo/public/cpp/application/application_connection.h" | 8 #include "mojo/public/cpp/application/application_connection.h" |
8 #include "mojo/public/cpp/application/application_delegate.h" | 9 #include "mojo/public/cpp/application/application_delegate.h" |
9 #include "mojo/public/cpp/application/application_impl.h" | 10 #include "mojo/public/cpp/application/application_impl.h" |
11 #include "mojo/public/cpp/application/application_runner_chromium.h" | |
10 #include "mojo/public/cpp/bindings/string.h" | 12 #include "mojo/public/cpp/bindings/string.h" |
11 #include "mojo/services/public/interfaces/gpu/gpu.mojom.h" | 13 #include "mojo/services/public/interfaces/gpu/gpu.mojom.h" |
12 | 14 |
13 namespace mojo { | 15 namespace mojo { |
14 namespace examples { | 16 namespace examples { |
15 | 17 |
16 class ChildGLApp : public ApplicationDelegate, public InterfaceFactory<Child> { | 18 class ChildGLApp : public ApplicationDelegate, public InterfaceFactory<Child> { |
17 public: | 19 public: |
18 ChildGLApp() {} | 20 ChildGLApp() {} |
19 virtual ~ChildGLApp() {} | 21 virtual ~ChildGLApp() {} |
(...skipping 23 matching lines...) Expand all Loading... | |
43 } | 45 } |
44 | 46 |
45 private: | 47 private: |
46 ApplicationConnection* surfaces_service_connection_; | 48 ApplicationConnection* surfaces_service_connection_; |
47 GpuPtr gpu_service_; | 49 GpuPtr gpu_service_; |
48 | 50 |
49 DISALLOW_COPY_AND_ASSIGN(ChildGLApp); | 51 DISALLOW_COPY_AND_ASSIGN(ChildGLApp); |
50 }; | 52 }; |
51 | 53 |
52 } // namespace examples | 54 } // namespace examples |
53 | 55 |
sky
2014/08/22 22:20:09
nit: remove 55 (just line 15/16 don't have a newli
| |
54 // static | 56 } // namespace mojo |
55 ApplicationDelegate* ApplicationDelegate::Create() { | 57 |
56 return new examples::ChildGLApp(); | 58 MojoResult MojoMain(MojoHandle shell_handle) { |
59 mojo::ApplicationRunnerChromium runner(new mojo::examples::ChildGLApp); | |
60 return runner.Run(shell_handle); | |
57 } | 61 } |
58 | |
59 } // namespace mojo | |
OLD | NEW |