Mojo: More virtual/override style fixes 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 46 matching lines @@
 class WindowManagerApp
     : public ApplicationDelegate,
       public ViewManagerDelegate,
       public ViewObserver,
       public ui::EventHandler,
       public aura::client::FocusChangeObserver,
       public aura::client::ActivationChangeObserver {
  public:
   WindowManagerApp(ViewManagerDelegate* view_manager_delegate,
                    WindowManagerDelegate* window_manager_delegate);
-  virtual ~WindowManagerApp();
+  ~WindowManagerApp() override;
 
   static View* GetViewForWindow(aura::Window* window);
   aura::Window* GetWindowForViewId(Id view);
 
   // Register/deregister new connections to the window manager service.
   void AddConnection(WindowManagerService2Impl* connection);
   void RemoveConnection(WindowManagerService2Impl* connection);
 
   // These are canonical implementations of the window manager API methods.
   void SetCapture(Id view);
@@ skipping 10 matching lines @@
     return window_manager_delegate_;
   }
 
   void InitFocus(wm::FocusRules* rules);
 
   void set_window_manager_client(WindowManagerClient* client) {
     window_manager_client_ = client;
   }
 
   // Overridden from ApplicationDelegate:
-  virtual void Initialize(ApplicationImpl* impl) override;
-  virtual bool ConfigureIncomingConnection(
-      ApplicationConnection* connection) override;
+  void Initialize(ApplicationImpl* impl) override;
+  bool ConfigureIncomingConnection(ApplicationConnection* connection) override;
 
  private:
   typedef std::set<WindowManagerService2Impl*> 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) override;
-  virtual void OnViewManagerDisconnected(ViewManager* view_manager) override;
+  void OnEmbed(ViewManager* view_manager,
+               View* root,
+               ServiceProviderImpl* exported_services,
+               scoped_ptr<ServiceProvider> imported_services) override;
+  void OnViewManagerDisconnected(ViewManager* view_manager) override;
 
   // Overridden from ViewObserver:
-  virtual void OnTreeChanged(
-      const ViewObserver::TreeChangeParams& params) override;
-  virtual void OnViewDestroying(View* view) override;
-  virtual void OnViewBoundsChanged(View* view,
-                                   const gfx::Rect& old_bounds,
-                                   const gfx::Rect& new_bounds) override;
+  void OnTreeChanged(const ViewObserver::TreeChangeParams& params) override;
+  void OnViewDestroying(View* view) override;
+  void OnViewBoundsChanged(View* view,
+                           const gfx::Rect& old_bounds,
+                           const gfx::Rect& new_bounds) override;
 
   // Overridden from ui::EventHandler:
-  virtual void OnEvent(ui::Event* event) override;
+  void OnEvent(ui::Event* event) override;
 
   // Overridden from aura::client::FocusChangeObserver:
-  virtual void OnWindowFocused(aura::Window* gained_focus,
-                               aura::Window* lost_focus) override;
+  void OnWindowFocused(aura::Window* gained_focus,
+                       aura::Window* lost_focus) override;
 
   // Overridden from aura::client::ActivationChangeObserver:
-  virtual void OnWindowActivated(aura::Window* gained_active,
-                                 aura::Window* lost_active) override;
+  void OnWindowActivated(aura::Window* gained_active,
+                         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);
   // Recursively invokes Unregister() for |view| and all its descendants.
   void UnregisterSubtree(View* view);
   // Deletes the aura::Windows associated with the hierarchy beneath |id|,
   // and removes from the registry.
@@ skipping 27 matching lines @@
   scoped_ptr<DummyDelegate> dummy_delegate_;
 
   WindowManagerClient* window_manager_client_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerApp);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_