replace OVERRIDE and FINAL with override and final in ash/

ash/extended_desktop_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/display/display_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 30 matching lines @@
   Shell::GetInstance()->display_manager()->
       SetLayoutForCurrentDisplays(layout);
 }
 
 class ModalWidgetDelegate : public views::WidgetDelegateView {
  public:
   ModalWidgetDelegate() {}
   virtual ~ModalWidgetDelegate() {}
 
   // Overridden from views::WidgetDelegate:
-  virtual views::View* GetContentsView() OVERRIDE {
+  virtual views::View* GetContentsView() override {
     return this;
   }
-  virtual ui::ModalType GetModalType() const OVERRIDE {
+  virtual ui::ModalType GetModalType() const override {
     return ui::MODAL_TYPE_SYSTEM;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ModalWidgetDelegate);
 };
 
 // An event handler which moves the target window to the secondary root window
 // at pre-handle phase of a mouse release event.
 class MoveWindowByClickEventHandler : public ui::EventHandler {
  public:
   explicit MoveWindowByClickEventHandler(aura::Window* target)
       : target_(target) {}
   virtual ~MoveWindowByClickEventHandler() {}
 
  private:
   // ui::EventHandler overrides:
-  virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
+  virtual void OnMouseEvent(ui::MouseEvent* event) override {
     if (event->type() == ui::ET_MOUSE_RELEASED) {
       aura::Window::Windows root_windows = Shell::GetAllRootWindows();
       DCHECK_LT(1u, root_windows.size());
       root_windows[1]->AddChild(target_);
     }
   }
 
   aura::Window* target_;
   DISALLOW_COPY_AND_ASSIGN(MoveWindowByClickEventHandler);
 };
 
 // An event handler which records the event's locations.
 class EventLocationRecordingEventHandler : public ui::EventHandler {
  public:
   explicit EventLocationRecordingEventHandler() {
     reset();
   }
   virtual ~EventLocationRecordingEventHandler() {}
 
   std::string GetLocationsAndReset() {
     std::string result =
         location_.ToString() + " " + root_location_.ToString();
     reset();
     return result;
   }
 
  private:
   // ui::EventHandler overrides:
-  virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
+  virtual void OnMouseEvent(ui::MouseEvent* event) override {
     if (event->type() == ui::ET_MOUSE_MOVED ||
         event->type() == ui::ET_MOUSE_DRAGGED) {
       location_ = event->location();
       root_location_ = event->root_location();
     }
   }
 
   void reset() {
     location_.SetPoint(-999, -999);
     root_location_.SetPoint(-999, -999);
   }
 
   gfx::Point root_location_;
   gfx::Point location_;
 
   DISALLOW_COPY_AND_ASSIGN(EventLocationRecordingEventHandler);
 };
 
 class EventLocationHandler : public ui::EventHandler {
  public:
   EventLocationHandler() {}
   virtual ~EventLocationHandler() {}
 
   const gfx::Point& press_location() const { return press_location_; }
   const gfx::Point& release_location() const { return release_location_; }
 
  private:
   // ui::EventHandler:
-  virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
+  virtual void OnMouseEvent(ui::MouseEvent* event) override {
     if (event->type() == ui::ET_MOUSE_PRESSED)
       press_location_ = event->location();
     else if (event->type() == ui::ET_MOUSE_RELEASED)
       release_location_ = event->location();
   }
 
   gfx::Point press_location_;
   gfx::Point release_location_;
 
   DISALLOW_COPY_AND_ASSIGN(EventLocationHandler);
@@ skipping 788 matching lines @@
   generator.ReleaseLeftButton();
   EXPECT_EQ("-999,-999 -999,-999", event_handler.GetLocationsAndReset());
 
   generator.MoveMouseTo(400, 150);
   EXPECT_EQ("100,150 100,150", event_handler.GetLocationsAndReset());
 
   ash::Shell::GetInstance()->RemovePreTargetHandler(&event_handler);
 }
 
 }  // namespace ash