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

Side by Side Diff: mojo/examples/pepper_container_app/pepper_container_app.cc

Issue 617503003: Mojo: MOJO_OVERRIDE -> override in mojo/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased 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/nesting_app/nesting_app.cc ('k') | mojo/examples/png_viewer/png_viewer.cc » ('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/macros.h"
6 #include "base/memory/ref_counted.h" 6 #include "base/memory/ref_counted.h"
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/memory/weak_ptr.h" 8 #include "base/memory/weak_ptr.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 19 matching lines...) Expand all
30 public NativeViewportClient, 30 public NativeViewportClient,
31 public MojoPpapiGlobals::Delegate { 31 public MojoPpapiGlobals::Delegate {
32 public: 32 public:
33 PepperContainerApp() 33 PepperContainerApp()
34 : ppapi_globals_(this), 34 : ppapi_globals_(this),
35 plugin_module_(new PluginModule), 35 plugin_module_(new PluginModule),
36 weak_factory_(this) {} 36 weak_factory_(this) {}
37 37
38 virtual ~PepperContainerApp() {} 38 virtual ~PepperContainerApp() {}
39 39
40 virtual void Initialize(ApplicationImpl* app) MOJO_OVERRIDE { 40 virtual void Initialize(ApplicationImpl* app) override {
41 app->ConnectToService("mojo:mojo_native_viewport_service", &viewport_); 41 app->ConnectToService("mojo:mojo_native_viewport_service", &viewport_);
42 viewport_.set_client(this); 42 viewport_.set_client(this);
43 43
44 // TODO(jamesr): Should be mojo:mojo_gpu_service 44 // TODO(jamesr): Should be mojo:mojo_gpu_service
45 app->ConnectToService("mojo:mojo_native_viewport_service", &gpu_service_); 45 app->ConnectToService("mojo:mojo_native_viewport_service", &gpu_service_);
46 46
47 SizePtr size(Size::New()); 47 SizePtr size(Size::New());
48 size->width = 800; 48 size->width = 800;
49 size->height = 600; 49 size->height = 600;
50 viewport_->Create(size.Pass(), 50 viewport_->Create(size.Pass(),
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 121
122 } // namespace examples 122 } // namespace examples
123 } // namespace mojo 123 } // namespace mojo
124 124
125 MojoResult MojoMain(MojoHandle shell_handle) { 125 MojoResult MojoMain(MojoHandle shell_handle) {
126 mojo::ApplicationRunnerChromium runner( 126 mojo::ApplicationRunnerChromium runner(
127 new mojo::examples::PepperContainerApp); 127 new mojo::examples::PepperContainerApp);
128 return runner.Run(shell_handle); 128 return runner.Run(shell_handle);
129 } 129 }
130 130
OLDNEW
« no previous file with comments | « mojo/examples/nesting_app/nesting_app.cc ('k') | mojo/examples/png_viewer/png_viewer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698