Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(297)

Side by Side Diff: mojo/examples/surfaces_app/child_gl_app.cc

Issue 623573002: Mojo: Convert the remaining OVERRIDEs to override in mojo/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « mojo/examples/surfaces_app/child_app.cc ('k') | mojo/examples/surfaces_app/child_gl_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/threading/platform_thread.h" 6 #include "base/threading/platform_thread.h"
6 #include "mojo/application/application_runner_chromium.h" 7 #include "mojo/application/application_runner_chromium.h"
7 #include "mojo/examples/surfaces_app/child_gl_impl.h" 8 #include "mojo/examples/surfaces_app/child_gl_impl.h"
8 #include "mojo/public/c/system/main.h" 9 #include "mojo/public/c/system/main.h"
9 #include "mojo/public/cpp/application/application_connection.h" 10 #include "mojo/public/cpp/application/application_connection.h"
10 #include "mojo/public/cpp/application/application_delegate.h" 11 #include "mojo/public/cpp/application/application_delegate.h"
11 #include "mojo/public/cpp/application/application_impl.h" 12 #include "mojo/public/cpp/application/application_impl.h"
12 #include "mojo/public/cpp/bindings/string.h" 13 #include "mojo/public/cpp/bindings/string.h"
13 #include "mojo/services/public/interfaces/gpu/gpu.mojom.h" 14 #include "mojo/services/public/interfaces/gpu/gpu.mojom.h"
14 15
15 namespace mojo { 16 namespace mojo {
16 namespace examples { 17 namespace examples {
17 18
18 class ChildGLApp : public ApplicationDelegate, public InterfaceFactory<Child> { 19 class ChildGLApp : public ApplicationDelegate, public InterfaceFactory<Child> {
19 public: 20 public:
20 ChildGLApp() {} 21 ChildGLApp() {}
21 virtual ~ChildGLApp() {} 22 virtual ~ChildGLApp() {}
22 23
23 virtual void Initialize(ApplicationImpl* app) OVERRIDE { 24 virtual void Initialize(ApplicationImpl* app) override {
24 surfaces_service_connection_ = 25 surfaces_service_connection_ =
25 app->ConnectToApplication("mojo:mojo_surfaces_service"); 26 app->ConnectToApplication("mojo:mojo_surfaces_service");
26 // TODO(jamesr): Should be mojo:mojo_gpu_service 27 // TODO(jamesr): Should be mojo:mojo_gpu_service
27 app->ConnectToService("mojo:mojo_native_viewport_service", &gpu_service_); 28 app->ConnectToService("mojo:mojo_native_viewport_service", &gpu_service_);
28 } 29 }
29 30
30 // ApplicationDelegate implementation. 31 // ApplicationDelegate implementation.
31 virtual bool ConfigureIncomingConnection( 32 virtual bool ConfigureIncomingConnection(
32 ApplicationConnection* connection) OVERRIDE { 33 ApplicationConnection* connection) override {
33 connection->AddService(this); 34 connection->AddService(this);
34 return true; 35 return true;
35 } 36 }
36 37
37 // InterfaceFactory<Child> implementation. 38 // InterfaceFactory<Child> implementation.
38 virtual void Create(ApplicationConnection* connection, 39 virtual void Create(ApplicationConnection* connection,
39 InterfaceRequest<Child> request) OVERRIDE { 40 InterfaceRequest<Child> request) override {
40 CommandBufferPtr command_buffer; 41 CommandBufferPtr command_buffer;
41 gpu_service_->CreateOffscreenGLES2Context(Get(&command_buffer)); 42 gpu_service_->CreateOffscreenGLES2Context(Get(&command_buffer));
42 BindToRequest( 43 BindToRequest(
43 new ChildGLImpl(surfaces_service_connection_, command_buffer.Pass()), 44 new ChildGLImpl(surfaces_service_connection_, command_buffer.Pass()),
44 &request); 45 &request);
45 } 46 }
46 47
47 private: 48 private:
48 ApplicationConnection* surfaces_service_connection_; 49 ApplicationConnection* surfaces_service_connection_;
49 GpuPtr gpu_service_; 50 GpuPtr gpu_service_;
50 51
51 DISALLOW_COPY_AND_ASSIGN(ChildGLApp); 52 DISALLOW_COPY_AND_ASSIGN(ChildGLApp);
52 }; 53 };
53 54
54 } // namespace examples 55 } // namespace examples
55 } // namespace mojo 56 } // namespace mojo
56 57
57 MojoResult MojoMain(MojoHandle shell_handle) { 58 MojoResult MojoMain(MojoHandle shell_handle) {
58 mojo::ApplicationRunnerChromium runner(new mojo::examples::ChildGLApp); 59 mojo::ApplicationRunnerChromium runner(new mojo::examples::ChildGLApp);
59 return runner.Run(shell_handle); 60 return runner.Run(shell_handle);
60 } 61 }
OLDNEW
« no previous file with comments | « mojo/examples/surfaces_app/child_app.cc ('k') | mojo/examples/surfaces_app/child_gl_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698