Mojo: MOJO_OVERRIDE -> override in mojo/.

mojo/services/window_manager/window_manager_app.h

 // 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.
 
 #ifndef MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
 #define MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
 
 #include <set>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 71 matching lines @@
 
   bool IsReady() const;
 
   // A client of this object will use this accessor to gain access to the
   // aura::Window hierarchy and attach event handlers.
   aura::WindowTreeHost* host() { return window_tree_host_.get(); }
 
   void InitFocus(wm::FocusRules* rules);
 
   // Overridden from ApplicationDelegate:
-  virtual void Initialize(ApplicationImpl* impl) MOJO_OVERRIDE;
-  virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
-      MOJO_OVERRIDE;
+  virtual void Initialize(ApplicationImpl* impl) override;
+  virtual bool ConfigureIncomingConnection(
+      ApplicationConnection* connection) override;
 
  private:
   typedef std::set<WindowManagerServiceImpl*> Connections;
   typedef std::map<Id, aura::Window*> ViewIdToWindowMap;
 
   // Overridden from ViewManagerDelegate:
-  virtual void OnEmbed(
-      ViewManager* view_manager,
-      View* root,
-      ServiceProviderImpl* exported_services,
-      scoped_ptr<ServiceProvider> imported_services) MOJO_OVERRIDE;
-  virtual void OnViewManagerDisconnected(
-      ViewManager* view_manager) MOJO_OVERRIDE;
+  virtual void OnEmbed(ViewManager* view_manager,
+                       View* root,
+                       ServiceProviderImpl* exported_services,
+                       scoped_ptr<ServiceProvider> imported_services) override;
+  virtual void OnViewManagerDisconnected(ViewManager* view_manager) override;
 
   // Overridden from WindowManagerDelegate:
   virtual void Embed(
       const String& url,
       InterfaceRequest<ServiceProvider> service_provider) OVERRIDE;
   virtual void DispatchEvent(EventPtr event) OVERRIDE;
 
   // Overridden from ViewObserver:
   virtual void OnTreeChanged(
-      const ViewObserver::TreeChangeParams& params) MOJO_OVERRIDE;
-  virtual void OnViewDestroyed(View* view) MOJO_OVERRIDE;
+      const ViewObserver::TreeChangeParams& params) override;
+  virtual void OnViewDestroyed(View* view) override;
   virtual void OnViewBoundsChanged(View* view,
                                    const gfx::Rect& old_bounds,
-                                   const gfx::Rect& new_bounds) MOJO_OVERRIDE;
+                                   const gfx::Rect& new_bounds) override;
 
   // Overridden from WindowTreeHostMojoDelegate:
-  virtual void CompositorContentsChanged(const SkBitmap& bitmap) MOJO_OVERRIDE;
+  virtual void CompositorContentsChanged(const SkBitmap& bitmap) override;
 
   // Overridden from ui::EventHandler:
-  virtual void OnEvent(ui::Event* event) MOJO_OVERRIDE;
+  virtual void OnEvent(ui::Event* event) override;
 
   // Overridden from aura::client::FocusChangeObserver:
   virtual void OnWindowFocused(aura::Window* gained_focus,
-                               aura::Window* lost_focus) MOJO_OVERRIDE;
+                               aura::Window* lost_focus) override;
 
   // Overridden from aura::client::ActivationChangeObserver:
   virtual void OnWindowActivated(aura::Window* gained_active,
-                                 aura::Window* lost_active) MOJO_OVERRIDE;
+                                 aura::Window* lost_active) override;
 
   // Creates an aura::Window for every view in the hierarchy beneath |view|,
   // and adds to the registry so that it can be retrieved later via
   // GetWindowForViewId().
   // TODO(beng): perhaps View should have a property bag.
   void RegisterSubtree(View* view, aura::Window* parent);
   // Deletes the aura::Windows associated with the hierarchy beneath |id|,
   // and removes from the registry.
   void UnregisterSubtree(View* view);
 
@@ skipping 18 matching lines @@
   ViewIdToWindowMap view_id_to_window_map_;
 
   scoped_ptr<DummyDelegate> dummy_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerApp);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_