replace OVERRIDE and FINAL with override and final in ui/

BUG=417463

Review URL: https://codereview.chromium.org/623293004

Cr-Commit-Position: refs/heads/master@{#298839}

9 files changed, 95 insertions, 95 deletions

diff --git a/ui/views/window/client_view.h b/ui/views/window/client_view.h
index 5a329aa..53d393b 100644
--- a/ui/views/window/client_view.h
+++ b/ui/views/window/client_view.h
@@ -57,18 +57,18 @@ class VIEWS_EXPORT ClientView : public View {
   virtual int NonClientHitTest(const gfx::Point& point);
 
   // Overridden from View:
-  virtual gfx::Size GetPreferredSize() const OVERRIDE;
-  virtual gfx::Size GetMinimumSize() const OVERRIDE;
-  virtual gfx::Size GetMaximumSize() const OVERRIDE;
-  virtual void Layout() OVERRIDE;
-  virtual const char* GetClassName() const OVERRIDE;
+  virtual gfx::Size GetPreferredSize() const override;
+  virtual gfx::Size GetMinimumSize() const override;
+  virtual gfx::Size GetMaximumSize() const override;
+  virtual void Layout() override;
+  virtual const char* GetClassName() const override;
 
  protected:
   // Overridden from View:
-  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
-  virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) override;
+  virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
   virtual void ViewHierarchyChanged(
-      const ViewHierarchyChangedDetails& details) OVERRIDE;
+      const ViewHierarchyChangedDetails& details) override;
 
   // Accessors for private data members.
   View* contents_view() const { return contents_view_; }
diff --git a/ui/views/window/custom_frame_view.h b/ui/views/window/custom_frame_view.h
index f2f738b..a09dd33 100644
--- a/ui/views/window/custom_frame_view.h
+++ b/ui/views/window/custom_frame_view.h
@@ -39,26 +39,26 @@ class VIEWS_EXPORT CustomFrameView : public NonClientFrameView,
   void Init(Widget* frame);
 
   // Overridden from NonClientFrameView:
-  virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
+  virtual gfx::Rect GetBoundsForClientView() const override;
   virtual gfx::Rect GetWindowBoundsForClientBounds(
-      const gfx::Rect& client_bounds) const OVERRIDE;
-  virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
+      const gfx::Rect& client_bounds) const override;
+  virtual int NonClientHitTest(const gfx::Point& point) override;
   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;
 
   // Overridden from View:
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
-  virtual void Layout() OVERRIDE;
-  virtual gfx::Size GetPreferredSize() const OVERRIDE;
-  virtual gfx::Size GetMinimumSize() const OVERRIDE;
-  virtual gfx::Size GetMaximumSize() const OVERRIDE;
+  virtual void OnPaint(gfx::Canvas* canvas) override;
+  virtual void Layout() override;
+  virtual gfx::Size GetPreferredSize() const override;
+  virtual gfx::Size GetMinimumSize() const override;
+  virtual gfx::Size GetMaximumSize() const override;
 
   // Overridden from ButtonListener:
-  virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE;
+  virtual void ButtonPressed(Button* sender, const ui::Event& event) override;
 
  private:
   friend class CustomFrameViewTest;
diff --git a/ui/views/window/custom_frame_view_unittest.cc b/ui/views/window/custom_frame_view_unittest.cc
index f4dc37a..68c79e8 100644
--- a/ui/views/window/custom_frame_view_unittest.cc
+++ b/ui/views/window/custom_frame_view_unittest.cc
@@ -35,8 +35,8 @@ class MinimizeAndMaximizeStateControlDelegate : public WidgetDelegateView {
   }
 
   // WidgetDelegate:
-  virtual bool CanMaximize() const OVERRIDE { return can_maximize_; }
-  virtual bool CanMinimize() const OVERRIDE { return can_minimize_; }
+  virtual bool CanMaximize() const override { return can_maximize_; }
+  virtual bool CanMinimize() const override { return can_minimize_; }
 
  private:
   bool can_maximize_;
@@ -66,8 +66,8 @@ class CustomFrameViewTest : public ViewsTestBase {
   }
 
   // ViewsTestBase:
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
  protected:
   const std::vector<views::FrameButton>& leading_buttons() {
diff --git a/ui/views/window/dialog_client_view.h b/ui/views/window/dialog_client_view.h
index 1e8ced1..bf38f25 100644
--- a/ui/views/window/dialog_client_view.h
+++ b/ui/views/window/dialog_client_view.h
@@ -46,27 +46,27 @@ class VIEWS_EXPORT DialogClientView : public ClientView,
   void UpdateDialogButtons();
 
   // ClientView implementation:
-  virtual bool CanClose() OVERRIDE;
-  virtual DialogClientView* AsDialogClientView() OVERRIDE;
-  virtual const DialogClientView* AsDialogClientView() const OVERRIDE;
+  virtual bool CanClose() override;
+  virtual DialogClientView* AsDialogClientView() override;
+  virtual const DialogClientView* AsDialogClientView() const override;
 
   // FocusChangeListener implementation:
   virtual void OnWillChangeFocus(View* focused_before,
-                                 View* focused_now) OVERRIDE;
+                                 View* focused_now) override;
   virtual void OnDidChangeFocus(View* focused_before,
-                                View* focused_now) OVERRIDE;
+                                View* focused_now) override;
 
   // View implementation:
-  virtual gfx::Size GetPreferredSize() const OVERRIDE;
-  virtual void Layout() OVERRIDE;
-  virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
+  virtual gfx::Size GetPreferredSize() const override;
+  virtual void Layout() override;
+  virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
   virtual void ViewHierarchyChanged(
-      const ViewHierarchyChangedDetails& details) OVERRIDE;
-  virtual void NativeViewHierarchyChanged() OVERRIDE;
-  virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE;
+      const ViewHierarchyChangedDetails& details) override;
+  virtual void NativeViewHierarchyChanged() override;
+  virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
 
   // ButtonListener implementation:
-  virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE;
+  virtual void ButtonPressed(Button* sender, const ui::Event& event) override;
 
  protected:
   // For testing.
@@ -82,8 +82,8 @@ class VIEWS_EXPORT DialogClientView : public ClientView,
   void CreateFootnoteView();
 
   // View implementation.
-  virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
-  virtual void ChildVisibilityChanged(View* child) OVERRIDE;
+  virtual void ChildPreferredSizeChanged(View* child) override;
+  virtual void ChildVisibilityChanged(View* child) override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(DialogClientViewTest, FocusManager);
diff --git a/ui/views/window/dialog_client_view_unittest.cc b/ui/views/window/dialog_client_view_unittest.cc
index 28b001f..6f4812cb 100644
--- a/ui/views/window/dialog_client_view_unittest.cc
+++ b/ui/views/window/dialog_client_view_unittest.cc
@@ -23,7 +23,7 @@ class TestDialogClientView : public DialogClientView {
   virtual ~TestDialogClientView() {}
 
   // DialogClientView implementation.
-  virtual DialogDelegate* GetDialogDelegate() const OVERRIDE { return dialog_; }
+  virtual DialogDelegate* GetDialogDelegate() const override { return dialog_; }
 
   View* GetContentsView() { return contents_view(); }
 
@@ -48,7 +48,7 @@ class DialogClientViewTest : public ViewsTestBase,
   virtual ~DialogClientViewTest() {}
 
   // testing::Test implementation.
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     dialog_buttons_ = ui::DIALOG_BUTTON_NONE;
     contents_.reset(new StaticSizedView(gfx::Size(100, 200)));
     client_view_.reset(new TestDialogClientView(contents_.get(), this));
@@ -57,10 +57,10 @@ class DialogClientViewTest : public ViewsTestBase,
   }
 
   // DialogDelegateView implementation.
-  virtual View* GetContentsView() OVERRIDE { return contents_.get(); }
-  virtual View* CreateExtraView() OVERRIDE { return extra_view_; }
-  virtual View* CreateFootnoteView() OVERRIDE { return footnote_view_; }
-  virtual int GetDialogButtons() const OVERRIDE { return dialog_buttons_; }
+  virtual View* GetContentsView() override { return contents_.get(); }
+  virtual View* CreateExtraView() override { return extra_view_; }
+  virtual View* CreateFootnoteView() override { return footnote_view_; }
+  virtual int GetDialogButtons() const override { return dialog_buttons_; }
 
  protected:
   gfx::Rect GetUpdatedClientBounds() {
diff --git a/ui/views/window/dialog_delegate.h b/ui/views/window/dialog_delegate.h
index 8a2533e..d2294c2 100644
--- a/ui/views/window/dialog_delegate.h
+++ b/ui/views/window/dialog_delegate.h
@@ -83,20 +83,20 @@ class VIEWS_EXPORT DialogDelegate : public ui::DialogModel,
   virtual bool Close();
 
   // Overridden from ui::DialogModel:
-  virtual base::string16 GetDialogLabel() const OVERRIDE;
-  virtual base::string16 GetDialogTitle() const OVERRIDE;
-  virtual int GetDialogButtons() const OVERRIDE;
-  virtual int GetDefaultDialogButton() const OVERRIDE;
-  virtual bool ShouldDefaultButtonBeBlue() const OVERRIDE;
+  virtual base::string16 GetDialogLabel() const override;
+  virtual base::string16 GetDialogTitle() const override;
+  virtual int GetDialogButtons() const override;
+  virtual int GetDefaultDialogButton() const override;
+  virtual bool ShouldDefaultButtonBeBlue() const override;
   virtual base::string16 GetDialogButtonLabel(
-      ui::DialogButton button) const OVERRIDE;
-  virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE;
+      ui::DialogButton button) const override;
+  virtual bool IsDialogButtonEnabled(ui::DialogButton button) const override;
 
   // Overridden from WidgetDelegate:
-  virtual View* GetInitiallyFocusedView() OVERRIDE;
-  virtual DialogDelegate* AsDialogDelegate() OVERRIDE;
-  virtual ClientView* CreateClientView(Widget* widget) OVERRIDE;
-  virtual NonClientFrameView* CreateNonClientFrameView(Widget* widget) OVERRIDE;
+  virtual View* GetInitiallyFocusedView() override;
+  virtual DialogDelegate* AsDialogDelegate() override;
+  virtual ClientView* CreateClientView(Widget* widget) override;
+  virtual NonClientFrameView* CreateNonClientFrameView(Widget* widget) override;
 
   // Create a frame view using the new dialog style.
   static NonClientFrameView* CreateDialogFrameView(Widget* widget);
@@ -114,7 +114,7 @@ class VIEWS_EXPORT DialogDelegate : public ui::DialogModel,
 
  protected:
   // Overridden from WidgetDelegate:
-  virtual ui::AXRole GetAccessibleWindowRole() const OVERRIDE;
+  virtual ui::AXRole GetAccessibleWindowRole() const override;
 
  private:
   // A flag indicating whether this dialog supports the new style.
@@ -132,10 +132,10 @@ class VIEWS_EXPORT DialogDelegateView : public DialogDelegate,
   virtual ~DialogDelegateView();
 
   // Overridden from DialogDelegate:
-  virtual void DeleteDelegate() OVERRIDE;
-  virtual Widget* GetWidget() OVERRIDE;
-  virtual const Widget* GetWidget() const OVERRIDE;
-  virtual View* GetContentsView() OVERRIDE;
+  virtual void DeleteDelegate() override;
+  virtual Widget* GetWidget() override;
+  virtual const Widget* GetWidget() const override;
+  virtual View* GetContentsView() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DialogDelegateView);
diff --git a/ui/views/window/dialog_delegate_unittest.cc b/ui/views/window/dialog_delegate_unittest.cc
index b355104..bbfa66b 100644
--- a/ui/views/window/dialog_delegate_unittest.cc
+++ b/ui/views/window/dialog_delegate_unittest.cc
@@ -27,24 +27,24 @@ class TestDialog : public DialogDelegateView, public ButtonListener {
   virtual ~TestDialog() {}
 
   // DialogDelegateView overrides:
-  virtual bool Cancel() OVERRIDE {
+  virtual bool Cancel() override {
     canceled_ = true;
     return closeable_;
   }
-  virtual bool Accept() OVERRIDE {
+  virtual bool Accept() override {
     accepted_ = true;
     return closeable_;
   }
 
   // DialogDelegateView overrides:
-  virtual gfx::Size GetPreferredSize() const OVERRIDE {
+  virtual gfx::Size GetPreferredSize() const override {
     return gfx::Size(200, 200);
   }
-  virtual base::string16 GetWindowTitle() const OVERRIDE { return title_; }
-  virtual bool UseNewStyleForThisDialog() const OVERRIDE { return true; }
+  virtual base::string16 GetWindowTitle() const override { return title_; }
+  virtual bool UseNewStyleForThisDialog() const override { return true; }
 
   // ButtonListener override:
-  virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE {
+  virtual void ButtonPressed(Button* sender, const ui::Event& event) override {
     last_pressed_button_ = sender;
   }
 
@@ -94,13 +94,13 @@ class DialogTest : public ViewsTestBase {
   DialogTest() : dialog_(NULL) {}
   virtual ~DialogTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ViewsTestBase::SetUp();
     dialog_ = new TestDialog();
     DialogDelegate::CreateDialogWidget(dialog_, GetContext(), NULL)->Show();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     dialog_->TearDown();
     ViewsTestBase::TearDown();
   }
diff --git a/ui/views/window/native_frame_view.h b/ui/views/window/native_frame_view.h
index 444bf96..3f4d09a 100644
--- a/ui/views/window/native_frame_view.h
+++ b/ui/views/window/native_frame_view.h
@@ -19,22 +19,22 @@ class VIEWS_EXPORT NativeFrameView : public NonClientFrameView {
   virtual ~NativeFrameView();
 
   // NonClientFrameView overrides:
-  virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
+  virtual gfx::Rect GetBoundsForClientView() const override;
   virtual gfx::Rect GetWindowBoundsForClientBounds(
-      const gfx::Rect& client_bounds) const OVERRIDE;
-  virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
+      const gfx::Rect& client_bounds) const override;
+  virtual int NonClientHitTest(const gfx::Point& point) override;
   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;
 
   // View overrides:
-  virtual gfx::Size GetPreferredSize() const OVERRIDE;
-  virtual gfx::Size GetMinimumSize() const OVERRIDE;
-  virtual gfx::Size GetMaximumSize() const OVERRIDE;
-  virtual const char* GetClassName() const OVERRIDE;
+  virtual gfx::Size GetPreferredSize() const override;
+  virtual gfx::Size GetMinimumSize() const override;
+  virtual gfx::Size GetMaximumSize() const override;
+  virtual const char* GetClassName() const override;
 
  private:
   // Our containing frame.
diff --git a/ui/views/window/non_client_view.h b/ui/views/window/non_client_view.h
index 434b782..99a6880 100644
--- a/ui/views/window/non_client_view.h
+++ b/ui/views/window/non_client_view.h
@@ -82,18 +82,18 @@ class VIEWS_EXPORT NonClientFrameView : public View,
   virtual void SizeConstraintsChanged() = 0;
 
   // View:
-  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
-  virtual const char* GetClassName() const OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) override;
+  virtual const char* GetClassName() const override;
 
  protected:
   NonClientFrameView();
 
   // ViewTargeterDelegate:
   virtual bool DoesIntersectRect(const View* target,
-                                 const gfx::Rect& rect) const OVERRIDE;
+                                 const gfx::Rect& rect) const override;
 
   // View:
-  virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
+  virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
 
  private:
   // Prevents the non-client frame view from being rendered as inactive when
@@ -215,24 +215,24 @@ class VIEWS_EXPORT NonClientView : public View, public ViewTargeterDelegate {
   void SetAccessibleName(const base::string16& name);
 
   // NonClientView, View overrides:
-  virtual gfx::Size GetPreferredSize() const OVERRIDE;
-  virtual gfx::Size GetMinimumSize() const OVERRIDE;
-  virtual gfx::Size GetMaximumSize() const OVERRIDE;
-  virtual void Layout() OVERRIDE;
-  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
-  virtual const char* GetClassName() const OVERRIDE;
+  virtual gfx::Size GetPreferredSize() const override;
+  virtual gfx::Size GetMinimumSize() const override;
+  virtual gfx::Size GetMaximumSize() const override;
+  virtual void Layout() override;
+  virtual void GetAccessibleState(ui::AXViewState* state) override;
+  virtual const char* GetClassName() const override;
 
   virtual views::View* GetTooltipHandlerForPoint(
-      const gfx::Point& point) OVERRIDE;
+      const gfx::Point& point) override;
 
  protected:
   // NonClientView, View overrides:
   virtual void ViewHierarchyChanged(
-      const ViewHierarchyChangedDetails& details) OVERRIDE;
+      const ViewHierarchyChangedDetails& details) override;
 
  private:
   // ViewTargeterDelegate:
-  virtual View* TargetForRect(View* root, const gfx::Rect& rect) OVERRIDE;
+  virtual View* TargetForRect(View* root, const gfx::Rect& rect) override;
 
   // A ClientView object or subclass, responsible for sizing the contents view
   // of the window, hit testing and perhaps other tasks depending on the