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

Unified Diff: mojo/examples/wm_flow/embedded/embedded.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, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/examples/wm_flow/app/app.cc ('k') | mojo/examples/wm_flow/init/init.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/examples/wm_flow/embedded/embedded.cc
diff --git a/mojo/examples/wm_flow/embedded/embedded.cc b/mojo/examples/wm_flow/embedded/embedded.cc
index 086fb6c2fe38203e0e7a53143fe0c91d95ebf476..0433d83bd2c2eac853d9801e66628afb0379ecd2 100644
--- a/mojo/examples/wm_flow/embedded/embedded.cc
+++ b/mojo/examples/wm_flow/embedded/embedded.cc
@@ -45,12 +45,12 @@ class WMFlowEmbedded : public mojo::ApplicationDelegate,
private:
// Overridden from Application:
- virtual void Initialize(mojo::ApplicationImpl* app) MOJO_OVERRIDE {
+ virtual void Initialize(mojo::ApplicationImpl* app) override {
view_manager_client_factory_.reset(
new mojo::ViewManagerClientFactory(app->shell(), this));
}
virtual bool ConfigureIncomingConnection(
- mojo::ApplicationConnection* connection) MOJO_OVERRIDE {
+ mojo::ApplicationConnection* connection) override {
connection->AddService(view_manager_client_factory_.get());
return true;
}
@@ -60,7 +60,7 @@ class WMFlowEmbedded : public mojo::ApplicationDelegate,
mojo::ViewManager* view_manager,
mojo::View* root,
mojo::ServiceProviderImpl* exported_services,
- scoped_ptr<mojo::ServiceProvider> imported_services) MOJO_OVERRIDE {
+ scoped_ptr<mojo::ServiceProvider> imported_services) override {
root->SetColor(SK_ColorMAGENTA);
exported_services->AddService(&embeddee_factory_);
@@ -69,7 +69,7 @@ class WMFlowEmbedded : public mojo::ApplicationDelegate,
base::Unretained(this)));
}
virtual void OnViewManagerDisconnected(
- mojo::ViewManager* view_manager) MOJO_OVERRIDE {}
+ mojo::ViewManager* view_manager) override {}
void HelloWorldAck() {
printf("HelloWorld() ack'ed\n");
« no previous file with comments | « mojo/examples/wm_flow/app/app.cc ('k') | mojo/examples/wm_flow/init/init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698