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

content/browser/web_contents/aura/gesture_nav_simple.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 "content/browser/web_contents/aura/gesture_nav_simple.h"
 
 #include "cc/layers/layer.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/renderer_host/overscroll_controller.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ skipping 38 matching lines @@
  public:
   explicit DeleteAfterAnimation(scoped_ptr<T> object)
       : object_(object.Pass()) {}
 
  private:
   friend class base::DeleteHelper<DeleteAfterAnimation<T> >;
 
   virtual ~DeleteAfterAnimation() {}
 
   // ui::ImplicitAnimationObserver:
-  virtual void OnImplicitAnimationsCompleted() OVERRIDE {
+  virtual void OnImplicitAnimationsCompleted() override {
     // Deleting an observer when a ScopedLayerAnimationSettings is iterating
     // over them can cause a crash (which can happen during tests). So instead,
     // schedule this observer to be deleted soon.
     BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE, this);
   }
 
   scoped_ptr<T> object_;
   DISALLOW_COPY_AND_ASSIGN(DeleteAfterAnimation);
 };
 
 }  // namespace
 
 // A layer delegate that paints the shield with the arrow in it.
 class ArrowLayerDelegate : public ui::LayerDelegate {
  public:
   explicit ArrowLayerDelegate(int resource_id)
       : image_(GetContentClient()->GetNativeImageNamed(resource_id)),
         left_arrow_(resource_id == IDR_BACK_ARROW) {
     CHECK(!image_.IsEmpty());
   }
 
   virtual ~ArrowLayerDelegate() {}
 
   bool left() const { return left_arrow_; }
 
  private:
   // ui::LayerDelegate:
-  virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE {
+  virtual void OnPaintLayer(gfx::Canvas* canvas) override {
     SkPaint paint;
     paint.setColor(SkColorSetARGB(0xa0, 0, 0, 0));
     paint.setStyle(SkPaint::kFill_Style);
     paint.setAntiAlias(true);
 
     canvas->DrawCircle(
         gfx::Point(left_arrow_ ? 0 : kArrowWidth, kArrowHeight / 2),
         kArrowWidth,
         paint);
     canvas->DrawImageInt(*image_.ToImageSkia(),
                          left_arrow_ ? 0 : kArrowWidth - image_.Width(),
                          (kArrowHeight - image_.Height()) / 2);
   }
 
   virtual void OnDelegatedFrameDamage(
-      const gfx::Rect& damage_rect_in_dip) OVERRIDE {}
+      const gfx::Rect& damage_rect_in_dip) override {}
 
-  virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {}
+  virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override {}
 
-  virtual base::Closure PrepareForLayerBoundsChange() OVERRIDE {
+  virtual base::Closure PrepareForLayerBoundsChange() override {
     return base::Closure();
   }
 
   const gfx::Image& image_;
   const bool left_arrow_;
 
   DISALLOW_COPY_AND_ASSIGN(ArrowLayerDelegate);
 };
 
 GestureNavSimple::GestureNavSimple(WebContentsImpl* web_contents)
@@ skipping 109 matching lines @@
   clip_layer_->SetBounds(window->layer()->bounds());
   clip_layer_->SetMasksToBounds(true);
   clip_layer_->Add(arrow_.get());
 
   ui::Layer* parent = window->layer()->parent();
   parent->Add(clip_layer_.get());
   parent->StackAtTop(clip_layer_.get());
 }
 
 }  // namespace content