Mojo: More virtual/override style fixes in mojo/.

mojo/services/view_manager/display_manager.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_VIEW_MANAGER_DISPLAY_MANAGER_H_
 #define MOJO_SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 22 matching lines @@
 class ServerView;
 
 // DisplayManager binds the root node to an actual display.
 class MOJO_VIEW_MANAGER_EXPORT DisplayManager
     : NON_EXPORTED_BASE(public NativeViewportClient),
       NON_EXPORTED_BASE(public SurfaceClient) {
  public:
   DisplayManager(ApplicationConnection* app_connection,
                  ConnectionManager* connection_manager,
                  const Callback<void()>& native_viewport_closed_callback);
-  virtual ~DisplayManager();
+  ~DisplayManager() override;
 
   // Schedules a paint for the specified region of the specified view.
   void SchedulePaint(const ServerView* view, const gfx::Rect& bounds);
 
   // See description above field for details.
   bool in_setup() const { return in_setup_; }
 
  private:
   void OnCreatedNativeViewport(uint64_t native_viewport_id);
   void OnSurfaceConnectionCreated(SurfacePtr surface, uint32_t id_namespace);
   void Draw();
 
   // NativeViewportClient implementation.
-  virtual void OnDestroyed() override;
-  virtual void OnSizeChanged(SizePtr size) override;
-  virtual void OnEvent(EventPtr event,
-                       const mojo::Callback<void()>& callback) override;
+  void OnDestroyed() override;
+  void OnSizeChanged(SizePtr size) override;
+  void OnEvent(EventPtr event, const mojo::Callback<void()>& callback) override;
 
   // SurfaceClient implementation.
-  virtual void ReturnResources(Array<ReturnedResourcePtr> resources) override;
+  void ReturnResources(Array<ReturnedResourcePtr> resources) override;
 
   ConnectionManager* connection_manager_;
 
   // Returns true if adding the root view's window to |window_tree_host_|.
   bool in_setup_;
 
   gfx::Size size_;
   gfx::Rect dirty_rect_;
   base::Timer draw_timer_;
 
   SurfacesServicePtr surfaces_service_;
   SurfacePtr surface_;
   scoped_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
   cc::SurfaceId surface_id_;
   NativeViewportPtr native_viewport_;
   Callback<void()> native_viewport_closed_callback_;
   base::WeakPtrFactory<DisplayManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayManager);
 };
 
 }  // namespace service
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_