replace OVERRIDE and FINAL with override and final in ash/

ash/wm/system_gesture_event_filter_unittest.cc

 // Copyright (c) 2012 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/wm/system_gesture_event_filter.h"
 
 #include <vector>
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/display/display_manager.h"
@@ skipping 32 matching lines @@
 namespace test {
 
 namespace {
 
 class ResizableWidgetDelegate : public views::WidgetDelegateView {
  public:
   ResizableWidgetDelegate() {}
   virtual ~ResizableWidgetDelegate() {}
 
  private:
-  virtual bool CanResize() const OVERRIDE { return true; }
-  virtual bool CanMaximize() const OVERRIDE { return true; }
-  virtual bool CanMinimize() const OVERRIDE { return true; }
-  virtual void DeleteDelegate() OVERRIDE { delete this; }
+  virtual bool CanResize() const override { return true; }
+  virtual bool CanMaximize() const override { return true; }
+  virtual bool CanMinimize() const override { return true; }
+  virtual void DeleteDelegate() override { delete this; }
 
   DISALLOW_COPY_AND_ASSIGN(ResizableWidgetDelegate);
 };
 
 // Support class for testing windows with a maximum size.
 class MaxSizeNCFV : public views::NonClientFrameView {
  public:
   MaxSizeNCFV() {}
  private:
-  virtual gfx::Size GetMaximumSize() const OVERRIDE {
+  virtual gfx::Size GetMaximumSize() const override {
     return gfx::Size(200, 200);
   }
-  virtual gfx::Rect GetBoundsForClientView() const OVERRIDE {
+  virtual gfx::Rect GetBoundsForClientView() const override {
     return gfx::Rect();
   };
 
   virtual gfx::Rect GetWindowBoundsForClientBounds(
-      const gfx::Rect& client_bounds) const OVERRIDE {
+      const gfx::Rect& client_bounds) const override {
     return gfx::Rect();
   };
 
   // This function must ask the ClientView to do a hittest.  We don't do this in
   // the parent NonClientView because that makes it more difficult to calculate
   // hittests for regions that are partially obscured by the ClientView, e.g.
   // HTSYSMENU.
-  virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE {
+  virtual int NonClientHitTest(const gfx::Point& point) override {
     return HTNOWHERE;
   }
   virtual void GetWindowMask(const gfx::Size& size,
-                             gfx::Path* window_mask) OVERRIDE {}
-  virtual void ResetWindowControls() OVERRIDE {}
-  virtual void UpdateWindowIcon() OVERRIDE {}
-  virtual void UpdateWindowTitle() OVERRIDE {}
-  virtual void SizeConstraintsChanged() OVERRIDE {}
+                             gfx::Path* window_mask) override {}
+  virtual void ResetWindowControls() override {}
+  virtual void UpdateWindowIcon() override {}
+  virtual void UpdateWindowTitle() override {}
+  virtual void SizeConstraintsChanged() override {}
 
   DISALLOW_COPY_AND_ASSIGN(MaxSizeNCFV);
 };
 
 class MaxSizeWidgetDelegate : public views::WidgetDelegateView {
  public:
   MaxSizeWidgetDelegate() {}
   virtual ~MaxSizeWidgetDelegate() {}
 
  private:
-  virtual bool CanResize() const OVERRIDE { return true; }
-  virtual bool CanMaximize() const OVERRIDE { return false; }
-  virtual void DeleteDelegate() OVERRIDE { delete this; }
+  virtual bool CanResize() const override { return true; }
+  virtual bool CanMaximize() const override { return false; }
+  virtual void DeleteDelegate() override { delete this; }
   virtual views::NonClientFrameView* CreateNonClientFrameView(
-      views::Widget* widget) OVERRIDE {
+      views::Widget* widget) override {
     return new MaxSizeNCFV;
   }
 
   DISALLOW_COPY_AND_ASSIGN(MaxSizeWidgetDelegate);
 };
 
 } // namespace
 
 class SystemGestureEventFilterTest : public AshTestBase {
  public:
@@ skipping 14 matching lines @@
   aura::Window* GetLongPressAffordanceTarget() {
     return GetLongPressAffordance()->tap_down_target_;
   }
 
   views::View* GetLongPressAffordanceView() {
     return reinterpret_cast<views::View*>(
         GetLongPressAffordance()->view_.get());
   }
 
   // Overridden from AshTestBase:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     // TODO(jonross): TwoFingerDragDelayed() and ThreeFingerGestureStopsDrag()
     // both use hardcoded touch points, assuming that they target empty header
     // space. Window control order now reflects configuration files and can
     // change. The tests should be improved to dynamically decide touch points.
     // To address this we specify the originally expected window control
     // positions to be consistent across tests.
     std::vector<views::FrameButton> leading;
     std::vector<views::FrameButton> trailing;
     trailing.push_back(views::FRAME_BUTTON_MINIMIZE);
     trailing.push_back(views::FRAME_BUTTON_MAXIMIZE);
@@ skipping 445 matching lines @@
   for (int i = 1; i <= 3; ++i)
     GetEventGenerator().ReleaseTouchId(i);
   EXPECT_EQ(event_handler.num_gesture_events(),
             delegate.GetGestureCountAndReset());
 
   aura::Env::GetInstance()->RemovePreTargetHandler(&event_handler);
 }
 
 }  // namespace test
 }  // namespace ash