replace OVERRIDE and FINAL with override and final in ui/

ui/views/focus/focus_traversal_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 "ui/views/focus/focus_manager.h"
 
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/models/combobox_model.h"
@@ skipping 71 matching lines @@
 const int kSearchButtonID = count++;
 const int kHelpLinkID = count++;
 
 const int kThumbnailContainerID = count++;  // 45
 const int kThumbnailStarID = count++;
 const int kThumbnailSuperStarID = count++;
 
 class DummyComboboxModel : public ui::ComboboxModel {
  public:
   // Overridden from ui::ComboboxModel:
-  virtual int GetItemCount() const OVERRIDE { return 10; }
-  virtual base::string16 GetItemAt(int index) OVERRIDE {
+  virtual int GetItemCount() const override { return 10; }
+  virtual base::string16 GetItemAt(int index) override {
     return ASCIIToUTF16("Item ") + base::IntToString16(index);
   }
 };
 
 // A View that can act as a pane.
 class PaneView : public View, public FocusTraversable {
  public:
   PaneView() : focus_search_(NULL) {}
 
   // If this method is called, this view will use GetPaneFocusTraversable to
   // have this provided FocusSearch used instead of the default one, allowing
   // you to trap focus within the pane.
   void EnablePaneFocus(FocusSearch* focus_search) {
     focus_search_ = focus_search;
   }
 
   // Overridden from View:
-  virtual FocusTraversable* GetPaneFocusTraversable() OVERRIDE {
+  virtual FocusTraversable* GetPaneFocusTraversable() override {
     if (focus_search_)
       return this;
     else
       return NULL;
   }
 
   // Overridden from FocusTraversable:
-  virtual views::FocusSearch* GetFocusSearch() OVERRIDE {
+  virtual views::FocusSearch* GetFocusSearch() override {
     return focus_search_;
   }
-  virtual FocusTraversable* GetFocusTraversableParent() OVERRIDE {
+  virtual FocusTraversable* GetFocusTraversableParent() override {
     return NULL;
   }
-  virtual View* GetFocusTraversableParentView() OVERRIDE {
+  virtual View* GetFocusTraversableParentView() override {
     return NULL;
   }
 
  private:
   FocusSearch* focus_search_;
 };
 
 // BorderView is a view containing a native window with its own view hierarchy.
 // It is interesting to test focus traversal from a view hierarchy to an inner
 // view hierarchy.
 class BorderView : public NativeViewHost {
  public:
   explicit BorderView(View* child) : child_(child), widget_(NULL) {
     DCHECK(child);
     SetFocusable(false);
   }
 
   virtual ~BorderView() {}
 
   virtual internal::RootView* GetContentsRootView() {
     return static_cast<internal::RootView*>(widget_->GetRootView());
   }
 
-  virtual FocusTraversable* GetFocusTraversable() OVERRIDE {
+  virtual FocusTraversable* GetFocusTraversable() override {
     return static_cast<internal::RootView*>(widget_->GetRootView());
   }
 
   virtual void ViewHierarchyChanged(
-      const ViewHierarchyChangedDetails& details) OVERRIDE {
+      const ViewHierarchyChangedDetails& details) override {
     NativeViewHost::ViewHierarchyChanged(details);
 
     if (details.child == this && details.is_add) {
       if (!widget_) {
         widget_ = new Widget;
         Widget::InitParams params(Widget::InitParams::TYPE_CONTROL);
         params.parent = details.parent->GetWidget()->GetNativeView();
         widget_->Init(params);
         widget_->SetFocusTraversableParentView(this);
         widget_->SetContentsView(child_);
@@ skipping 13 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(BorderView);
 };
 
 }  // namespace
 
 class FocusTraversalTest : public FocusManagerTest {
  public:
   virtual ~FocusTraversalTest();
 
-  virtual void InitContentView() OVERRIDE;
+  virtual void InitContentView() override;
 
  protected:
   FocusTraversalTest();
 
   View* FindViewByID(int id) {
     View* view = GetContentsView()->GetViewByID(id);
     if (view)
       return view;
     if (style_tab_)
       view = style_tab_->GetSelectedTab()->GetViewByID(id);
@@ skipping 571 matching lines @@
       GetFocusManager()->AdvanceFocus(true);
       View* focused_view = GetFocusManager()->GetFocusedView();
       EXPECT_TRUE(focused_view != NULL);
       if (focused_view)
         EXPECT_EQ(kRightTraversalIDs[j], focused_view->id());
     }
   }
 }
 
 }  // namespace views