Mojo: MOJO_OVERRIDE -> override in mojo/.

mojo/examples/wm_flow/wm/wm.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <vector>
 
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/examples/wm_flow/wm/frame_controller.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_delegate.h"
@@ skipping 17 matching lines @@
 class WMFocusRules : public wm::FocusRules {
  public:
   WMFocusRules(mojo::WindowManagerApp* window_manager_app,
                mojo::View* window_container)
       : window_container_(window_container),
         window_manager_app_(window_manager_app) {}
   virtual ~WMFocusRules() {}
 
  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();
       // Unparented hierarchy, there is no "top level" window.
       if (!view)
         return NULL;
     }
 
     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();
          it != children.rend(); ++it) {
       if (*it != ignore)
         return *it;
     }
     return NULL;
   }
 
@@ skipping 13 matching lines @@
   SimpleWM()
       : window_manager_app_(new mojo::WindowManagerApp(this, this)),
         view_manager_(NULL),
         root_(NULL),
         window_container_(NULL),
         next_window_origin_(10, 10) {}
   virtual ~SimpleWM() {}
 
  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;
   }
 
   // Overridden from mojo::ViewManagerDelegate:
   virtual void OnEmbed(
       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;
 
     window_container_ = mojo::View::Create(view_manager_);
     window_container_->SetBounds(root_->bounds());
     root_->AddChild(window_container_);
 
     window_manager_app_->InitFocus(new WMFocusRules(window_manager_app_.get(),
                                                     window_container_));
   }
   virtual void OnViewManagerDisconnected(
-      mojo::ViewManager* view_manager) MOJO_OVERRIDE {
+      mojo::ViewManager* view_manager) override {
     view_manager_ = NULL;
     root_ = NULL;
   }
 
   // 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);
 
     // TODO(beng): We're dropping the |service_provider| passed from the client
     //             on the floor here and passing our own. Seems like we should
     //             be sending both. I'm not yet sure how this sould work for
     //             N levels of proxying.
     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);
   }
 
   void CloseWindow(mojo::View* view) {
     mojo::View* first_child = view->children().front();
     first_child->Destroy();
     view->Destroy();
     next_window_origin_.Offset(-50, -50);
   }
 
@@ skipping 20 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SimpleWM);
 };
 
 }  // namespace examples
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ViewsInit views_init;
   mojo::ApplicationRunnerChromium runner(new examples::SimpleWM);
   return runner.Run(shell_handle);
 }