Mojo: MOJO_OVERRIDE -> override in mojo/.

mojo/examples/wm_flow/wm/wm.cc

Index: mojo/examples/wm_flow/wm/wm.cc
diff --git a/mojo/examples/wm_flow/wm/wm.cc b/mojo/examples/wm_flow/wm/wm.cc
index f1f23e648e1561e14e8f618f39206df8085925a3..f2787fcbe4042e08611abc138f79c4bf12d812d3 100644
--- a/mojo/examples/wm_flow/wm/wm.cc
+++ b/mojo/examples/wm_flow/wm/wm.cc
@@ -35,19 +35,18 @@ class WMFocusRules : public wm::FocusRules {
 
  private:
   // Overridden from wm::FocusRules:
-  virtual bool IsToplevelWindow(aura::Window* window) const MOJO_OVERRIDE {
+  virtual bool IsToplevelWindow(aura::Window* window) const override {
     return mojo::WindowManagerApp::GetViewForWindow(window)->parent() ==
         window_container_;
   }
-  virtual bool CanActivateWindow(aura::Window* window) const MOJO_OVERRIDE {
+  virtual bool CanActivateWindow(aura::Window* window) const override {
     return mojo::WindowManagerApp::GetViewForWindow(window)->parent() ==
         window_container_;
   }
-  virtual bool CanFocusWindow(aura::Window* window) const MOJO_OVERRIDE {
+  virtual bool CanFocusWindow(aura::Window* window) const override {
     return true;
   }
-  virtual aura::Window* GetToplevelWindow(
-      aura::Window* window) const MOJO_OVERRIDE {
+  virtual aura::Window* GetToplevelWindow(aura::Window* window) const override {
     mojo::View* view = mojo::WindowManagerApp::GetViewForWindow(window);
     while (view->parent() != window_container_) {
       view = view->parent();
@@ -59,15 +58,15 @@ class WMFocusRules : public wm::FocusRules {
     return window_manager_app_->GetWindowForViewId(view->id());
   }
   virtual aura::Window* GetActivatableWindow(
-      aura::Window* window) const MOJO_OVERRIDE {
+      aura::Window* window) const override {
     return GetToplevelWindow(window);
   }
   virtual aura::Window* GetFocusableWindow(
-      aura::Window* window) const MOJO_OVERRIDE {
+      aura::Window* window) const override {
     return window;
   }
   virtual aura::Window* GetNextActivatableWindow(
-      aura::Window* ignore) const MOJO_OVERRIDE {
+      aura::Window* ignore) const override {
     aura::Window* activatable = GetActivatableWindow(ignore);
     const aura::Window::Windows& children = activatable->parent()->children();
     for (aura::Window::Windows::const_reverse_iterator it = children.rbegin();
@@ -101,11 +100,11 @@ class SimpleWM : public mojo::ApplicationDelegate,
 
  private:
   // Overridden from mojo::ApplicationDelegate:
-  virtual void Initialize(mojo::ApplicationImpl* impl) MOJO_OVERRIDE {
+  virtual void Initialize(mojo::ApplicationImpl* impl) override {
     window_manager_app_->Initialize(impl);
   }
   virtual bool ConfigureIncomingConnection(
-      mojo::ApplicationConnection* connection) MOJO_OVERRIDE {
+      mojo::ApplicationConnection* connection) override {
     window_manager_app_->ConfigureIncomingConnection(connection);
     return true;
   }
@@ -115,7 +114,7 @@ class SimpleWM : public mojo::ApplicationDelegate,
       mojo::ViewManager* view_manager,
       mojo::View* root,
       mojo::ServiceProviderImpl* exported_services,
-      scoped_ptr<mojo::ServiceProvider> remote_service_provider) MOJO_OVERRIDE {
+      scoped_ptr<mojo::ServiceProvider> remote_service_provider) override {
     view_manager_ = view_manager;
     root_ = root;
 
@@ -127,7 +126,7 @@ class SimpleWM : public mojo::ApplicationDelegate,
                                                     window_container_));
   }
   virtual void OnViewManagerDisconnected(
-      mojo::ViewManager* view_manager) MOJO_OVERRIDE {
+      mojo::ViewManager* view_manager) override {
     view_manager_ = NULL;
     root_ = NULL;
   }
@@ -135,8 +134,7 @@ class SimpleWM : public mojo::ApplicationDelegate,
   // Overridden from mojo::WindowManagerDelegate:
   virtual void Embed(
       const mojo::String& url,
-      mojo::InterfaceRequest<mojo::ServiceProvider> service_provider)
-          MOJO_OVERRIDE {
+      mojo::InterfaceRequest<mojo::ServiceProvider> service_provider) override {
     mojo::View* app_view = NULL;
     mojo::View* frame_view = CreateTopLevelWindow(&app_view);
     window_container_->AddChild(frame_view);
@@ -148,18 +146,18 @@ class SimpleWM : public mojo::ApplicationDelegate,
     app_view->Embed(url, scoped_ptr<mojo::ServiceProviderImpl>(
         new mojo::ServiceProviderImpl).Pass());
   }
-  virtual void DispatchEvent(mojo::EventPtr event) MOJO_OVERRIDE {}
+  virtual void DispatchEvent(mojo::EventPtr event) 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_RIGHT_MOUSE_BUTTON &&
         view->parent() == window_container_) {
       CloseWindow(view);
     }
   }
-  virtual void OnViewDestroyed(mojo::View* view) MOJO_OVERRIDE {
+  virtual void OnViewDestroyed(mojo::View* view) override {
     view->RemoveObserver(this);
   }