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

Side by Side Diff: mojo/examples/demo_launcher/demo_launcher.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/dbus_echo/dbus_echo_app.cc ('k') | mojo/examples/echo/echo_client.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/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/run_loop.h" 7 #include "base/run_loop.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"
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/application/service_provider_impl.h" 13 #include "mojo/public/cpp/application/service_provider_impl.h"
14 #include "mojo/public/interfaces/application/service_provider.mojom.h" 14 #include "mojo/public/interfaces/application/service_provider.mojom.h"
15 #include "mojo/services/public/cpp/view_manager/view_manager.h" 15 #include "mojo/services/public/cpp/view_manager/view_manager.h"
16 #include "mojo/services/public/cpp/view_manager/view_manager_context.h" 16 #include "mojo/services/public/cpp/view_manager/view_manager_context.h"
17 17
18 namespace examples { 18 namespace examples {
19 19
20 class DemoLauncher : public mojo::ApplicationDelegate { 20 class DemoLauncher : public mojo::ApplicationDelegate {
21 public: 21 public:
22 DemoLauncher() {} 22 DemoLauncher() {}
23 virtual ~DemoLauncher() {} 23 virtual ~DemoLauncher() {}
24 24
25 private: 25 private:
26 virtual void Initialize(mojo::ApplicationImpl* app) MOJO_OVERRIDE { 26 virtual void Initialize(mojo::ApplicationImpl* app) override {
27 context_.reset(new mojo::ViewManagerContext(app)); 27 context_.reset(new mojo::ViewManagerContext(app));
28 context_->Embed("mojo:mojo_window_manager"); 28 context_->Embed("mojo:mojo_window_manager");
29 } 29 }
30 30
31 scoped_ptr<mojo::ViewManagerContext> context_; 31 scoped_ptr<mojo::ViewManagerContext> context_;
32 32
33 DISALLOW_COPY_AND_ASSIGN(DemoLauncher); 33 DISALLOW_COPY_AND_ASSIGN(DemoLauncher);
34 }; 34 };
35 35
36 } // namespace examples 36 } // namespace examples
37 37
38 MojoResult MojoMain(MojoHandle shell_handle) { 38 MojoResult MojoMain(MojoHandle shell_handle) {
39 mojo::ApplicationRunnerChromium runner(new examples::DemoLauncher); 39 mojo::ApplicationRunnerChromium runner(new examples::DemoLauncher);
40 return runner.Run(shell_handle); 40 return runner.Run(shell_handle);
41 } 41 }
OLDNEW
« no previous file with comments | « mojo/examples/dbus_echo/dbus_echo_app.cc ('k') | mojo/examples/echo/echo_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698