replace OVERRIDE and FINAL with override and final in ash/

ash/display/display_configurator_animation.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 "ash/display/display_configurator_animation.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "base/bind.h"
 #include "base/stl_util.h"
@@ skipping 46 matching lines @@
   class Observer : public ui::LayerAnimationObserver {
    public:
     Observer(ui::LayerAnimator* animator,
              CallbackRunningObserver* observer)
         : animator_(animator),
           observer_(observer) {}
 
    protected:
     // ui::LayerAnimationObserver overrides:
     virtual void OnLayerAnimationEnded(
-        ui::LayerAnimationSequence* sequence) OVERRIDE {
+        ui::LayerAnimationSequence* sequence) override {
       animator_->RemoveObserver(this);
       observer_->OnSingleTaskCompleted();
     }
     virtual void OnLayerAnimationAborted(
-        ui::LayerAnimationSequence* sequence) OVERRIDE {
+        ui::LayerAnimationSequence* sequence) override {
       animator_->RemoveObserver(this);
       observer_->OnSingleTaskAborted();
     }
     virtual void OnLayerAnimationScheduled(
-        ui::LayerAnimationSequence* sequence) OVERRIDE {
+        ui::LayerAnimationSequence* sequence) override {
     }
-    virtual bool RequiresNotificationWhenAnimatorDestroyed() const OVERRIDE {
+    virtual bool RequiresNotificationWhenAnimatorDestroyed() const override {
       return true;
     }
 
    private:
     ui::LayerAnimator* animator_;
     CallbackRunningObserver* observer_;
 
     DISALLOW_COPY_AND_ASSIGN(Observer);
   };
 
@@ skipping 129 matching lines @@
   if (timer_) {
     timer_->Stop();
     timer_.reset();
   }
   STLDeleteContainerPairSecondPointers(
       hiding_layers_.begin(), hiding_layers_.end());
   hiding_layers_.clear();
 }
 
 }  // namespace ash