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

Unified Diff: mojo/examples/wm_flow/app/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, 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/window_manager/window_manager.cc ('k') | mojo/examples/wm_flow/embedded/embedded.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/examples/wm_flow/app/app.cc
diff --git a/mojo/examples/wm_flow/app/app.cc b/mojo/examples/wm_flow/app/app.cc
index 9e9d8cf2c9528c0510ecde3073eba5ae7f17adfc..b119877e84c3e50aaba00d810c6545b4fd868fd5 100644
--- a/mojo/examples/wm_flow/app/app.cc
+++ b/mojo/examples/wm_flow/app/app.cc
@@ -55,7 +55,7 @@ class WMFlowApp : 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));
view_manager_context_.reset(new mojo::ViewManagerContext(app));
@@ -64,7 +64,7 @@ class WMFlowApp : public mojo::ApplicationDelegate,
OpenNewWindow();
}
virtual bool ConfigureIncomingConnection(
- mojo::ApplicationConnection* connection) MOJO_OVERRIDE {
+ mojo::ApplicationConnection* connection) override {
connection->AddService(view_manager_client_factory_.get());
return true;
}
@@ -76,7 +76,7 @@ class WMFlowApp : 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->AddObserver(this);
root->SetColor(kColors[embed_count_++ % arraysize(kColors)]);
@@ -97,17 +97,17 @@ class WMFlowApp : public mojo::ApplicationDelegate,
base::Unretained(this)));
}
virtual void OnViewManagerDisconnected(
- mojo::ViewManager* view_manager) MOJO_OVERRIDE {}
+ mojo::ViewManager* view_manager) override {}
// Overridden from mojo::ViewObserver:
virtual void OnViewInputEvent(mojo::View* view,
- const mojo::EventPtr& event) MOJO_OVERRIDE {
+ const mojo::EventPtr& event) override {
if (event->action == mojo::EVENT_TYPE_MOUSE_RELEASED &&
event->flags & mojo::EVENT_FLAGS_LEFT_MOUSE_BUTTON) {
OpenNewWindow();
}
}
- virtual void OnViewDestroyed(mojo::View* view) MOJO_OVERRIDE {
+ virtual void OnViewDestroyed(mojo::View* view) override {
--embed_count_;
view->RemoveObserver(this);
}
« no previous file with comments | « mojo/examples/window_manager/window_manager.cc ('k') | mojo/examples/wm_flow/embedded/embedded.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698