Replacing the OVERRIDE with override and FINAL with final in content/browser/geolocation/web_conten…

content/browser/web_contents/aura/window_slider.h

 // Copyright (c) 2013 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 CONTENT_BROWSER_WEB_CONTENTS_AURA_WINDOW_SLIDER_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_AURA_WINDOW_SLIDER_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 87 matching lines @@
   void ResetSlide();
 
   // The following callbacks are triggered after an animation.
   void SlideAnimationCompleted(scoped_ptr<ui::Layer> layer,
                                scoped_ptr<ShadowLayerDelegate> shadow);
 
   void ResetSlideAnimationCompleted(scoped_ptr<ui::Layer> layer,
                                     scoped_ptr<ShadowLayerDelegate> shadow);
 
   // Overridden from ui::EventHandler:
-  virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
-  virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
-  virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
-  virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
+  virtual void OnKeyEvent(ui::KeyEvent* event) override;
+  virtual void OnMouseEvent(ui::MouseEvent* event) override;
+  virtual void OnScrollEvent(ui::ScrollEvent* event) override;
+  virtual void OnGestureEvent(ui::GestureEvent* event) override;
 
   // Overridden from aura::WindowObserver:
   virtual void OnWindowRemovingFromRootWindow(aura::Window* window,
-                                              aura::Window* new_root) OVERRIDE;
+                                              aura::Window* new_root) override;
 
   Delegate* delegate_;
 
   // The slider intercepts scroll events from this window. The slider does not
   // own |event_window_|. If |event_window_| is destroyed, then the slider stops
   // listening for events, but it doesn't destroy itself.
   aura::Window* event_window_;
 
   // The window the slider operates on. The lifetime of the slider is bound to
   // this window (i.e. if |owner_| does, the slider destroys itself). The slider
@@ skipping 21 matching lines @@
   const float complete_threshold_;
 
   base::WeakPtrFactory<WindowSlider> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowSlider);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_AURA_WINDOW_SLIDER_H_