Standardize usage of virtual/override/final specifiers.

ui/views/view_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 <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 172 matching lines @@
 typedef ViewsTestBase ViewTest;
 
 // A derived class for testing purpose.
 class TestView : public View {
  public:
   TestView()
       : View(),
         delete_on_pressed_(false),
         native_theme_(NULL),
         can_process_events_within_subtree_(true) {}
-  virtual ~TestView() {}
+  ~TestView() override {}
 
   // Reset all test state
   void Reset() {
     did_change_bounds_ = false;
     last_mouse_event_type_ = 0;
     location_.SetPoint(0, 0);
     received_mouse_enter_ = false;
     received_mouse_exit_ = false;
     last_clip_.setEmpty();
     accelerator_count_map_.clear();
     can_process_events_within_subtree_ = true;
   }
 
   // Exposed as public for testing.
   void DoFocus() {
     views::View::Focus();
   }
 
   void DoBlur() {
     views::View::Blur();
   }
 
   bool focusable() const { return View::focusable(); }
 
   void set_can_process_events_within_subtree(bool can_process) {
     can_process_events_within_subtree_ = can_process;
   }
 
-  virtual bool CanProcessEventsWithinSubtree() const override {
+  bool CanProcessEventsWithinSubtree() const override {
     return can_process_events_within_subtree_;
   }
 
-  virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
-  virtual bool OnMousePressed(const ui::MouseEvent& event) override;
-  virtual bool OnMouseDragged(const ui::MouseEvent& event) override;
-  virtual void OnMouseReleased(const ui::MouseEvent& event) override;
-  virtual void OnMouseEntered(const ui::MouseEvent& event) override;
-  virtual void OnMouseExited(const ui::MouseEvent& event) override;
+  void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
+  bool OnMousePressed(const ui::MouseEvent& event) override;
+  bool OnMouseDragged(const ui::MouseEvent& event) override;
+  void OnMouseReleased(const ui::MouseEvent& event) override;
+  void OnMouseEntered(const ui::MouseEvent& event) override;
+  void OnMouseExited(const ui::MouseEvent& event) override;
 
-  virtual void Paint(gfx::Canvas* canvas, const CullSet& cull_set) override;
-  virtual void SchedulePaintInRect(const gfx::Rect& rect) override;
-  virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
+  void Paint(gfx::Canvas* canvas, const CullSet& cull_set) override;
+  void SchedulePaintInRect(const gfx::Rect& rect) override;
+  bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
 
-  virtual void OnNativeThemeChanged(const ui::NativeTheme* native_theme)
-      override;
+  void OnNativeThemeChanged(const ui::NativeTheme* native_theme) override;
 
   // OnBoundsChanged.
   bool did_change_bounds_;
   gfx::Rect new_bounds_;
 
   // MouseEvent.
   int last_mouse_event_type_;
   gfx::Point location_;
   bool received_mouse_enter_;
   bool received_mouse_exit_;
@@ skipping 1234 matching lines @@
 }
 #endif  // 0
 
 ////////////////////////////////////////////////////////////////////////////////
 // Native view hierachy
 ////////////////////////////////////////////////////////////////////////////////
 class ToplevelWidgetObserverView : public View {
  public:
   ToplevelWidgetObserverView() : toplevel_(NULL) {
   }
-  virtual ~ToplevelWidgetObserverView() {
-  }
+  ~ToplevelWidgetObserverView() override {}
 
   // View overrides:
-  virtual void ViewHierarchyChanged(
+  void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) override {
     if (details.is_add) {
       toplevel_ = GetWidget() ? GetWidget()->GetTopLevelWidget() : NULL;
     } else {
       toplevel_ = NULL;
     }
   }
-  virtual void NativeViewHierarchyChanged() override {
+  void NativeViewHierarchyChanged() override {
     toplevel_ = GetWidget() ? GetWidget()->GetTopLevelWidget() : NULL;
   }
 
   Widget* toplevel() { return toplevel_; }
 
  private:
   Widget* toplevel_;
 
   DISALLOW_COPY_AND_ASSIGN(ToplevelWidgetObserverView);
 };
@@ skipping 37 matching lines @@
   child->SetContentsView(observer_view);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Transformations
 ////////////////////////////////////////////////////////////////////////////////
 
 class TransformPaintView : public TestView {
  public:
   TransformPaintView() {}
-  virtual ~TransformPaintView() {}
+  ~TransformPaintView() override {}
 
   void ClearScheduledPaintRect() {
     scheduled_paint_rect_ = gfx::Rect();
   }
 
   gfx::Rect scheduled_paint_rect() const { return scheduled_paint_rect_; }
 
   // Overridden from View:
-  virtual void SchedulePaintInRect(const gfx::Rect& rect) override {
+  void SchedulePaintInRect(const gfx::Rect& rect) override {
     gfx::Rect xrect = ConvertRectToParent(rect);
     scheduled_paint_rect_.Union(xrect);
   }
 
  private:
   gfx::Rect scheduled_paint_rect_;
 
   DISALLOW_COPY_AND_ASSIGN(TransformPaintView);
 };
 
@@ skipping 209 matching lines @@
 
   widget->CloseNow();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // OnVisibleBoundsChanged()
 
 class VisibleBoundsView : public View {
  public:
   VisibleBoundsView() : received_notification_(false) {}
-  virtual ~VisibleBoundsView() {}
+  ~VisibleBoundsView() override {}
 
   bool received_notification() const { return received_notification_; }
   void set_received_notification(bool received) {
     received_notification_ = received;
   }
 
  private:
   // Overridden from View:
-  virtual bool GetNeedsNotificationWhenVisibleBoundsChange() const override {
+  bool GetNeedsNotificationWhenVisibleBoundsChange() const override {
      return true;
   }
-  virtual void OnVisibleBoundsChanged() override {
-    received_notification_ = true;
-  }
+  void OnVisibleBoundsChanged() override { received_notification_ = true; }
 
   bool received_notification_;
 
   DISALLOW_COPY_AND_ASSIGN(VisibleBoundsView);
 };
 
 TEST_F(ViewTest, OnVisibleBoundsChanged) {
   gfx::Rect viewport_bounds(0, 0, 100, 100);
 
   scoped_ptr<Widget> widget(new Widget);
@@ skipping 381 matching lines @@
   // |v2| now occupies (20, 20) to (120, 70) in |widget|
   EXPECT_EQ(gfx::Rect(22, 60, 21, 8).ToString(),
             v2->ConvertRectToWidget(rect).ToString());
 
   widget->CloseNow();
 }
 
 class ObserverView : public View {
  public:
   ObserverView();
-  virtual ~ObserverView();
+  ~ObserverView() override;
 
   void ResetTestState();
 
   bool has_add_details() const { return has_add_details_; }
   bool has_remove_details() const { return has_remove_details_; }
 
   const ViewHierarchyChangedDetails& add_details() const {
     return add_details_;
   }
 
   const ViewHierarchyChangedDetails& remove_details() const {
     return remove_details_;
   }
 
  private:
   // View:
-  virtual void ViewHierarchyChanged(
+  void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) override;
 
   bool has_add_details_;
   bool has_remove_details_;
   ViewHierarchyChangedDetails add_details_;
   ViewHierarchyChangedDetails remove_details_;
 
   DISALLOW_COPY_AND_ASSIGN(ObserverView);
 };
 
@@ skipping 397 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // FocusManager
 ////////////////////////////////////////////////////////////////////////////////
 
 // A widget that always claims to be active, regardless of its real activation
 // status.
 class ActiveWidget : public Widget {
  public:
   ActiveWidget() {}
-  virtual ~ActiveWidget() {}
+  ~ActiveWidget() override {}
 
-  virtual bool IsActive() const override {
-    return true;
-  }
+  bool IsActive() const override { return true; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ActiveWidget);
 };
 
 TEST_F(ViewTest, AdvanceFocusIfNecessaryForUnfocusableView) {
   // Create a widget with two views and give the first one focus.
   ActiveWidget widget;
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
@@ skipping 43 matching lines @@
 namespace {
 
 // Test implementation of LayerAnimator.
 class TestLayerAnimator : public ui::LayerAnimator {
  public:
   TestLayerAnimator();
 
   const gfx::Rect& last_bounds() const { return last_bounds_; }
 
   // LayerAnimator.
-  virtual void SetBounds(const gfx::Rect& bounds) override;
+  void SetBounds(const gfx::Rect& bounds) override;
 
  protected:
-  virtual ~TestLayerAnimator() { }
+  ~TestLayerAnimator() override {}
 
  private:
   gfx::Rect last_bounds_;
 
   DISALLOW_COPY_AND_ASSIGN(TestLayerAnimator);
 };
 
 TestLayerAnimator::TestLayerAnimator()
     : ui::LayerAnimator(base::TimeDelta::FromMilliseconds(0)) {
 }
 
 void TestLayerAnimator::SetBounds(const gfx::Rect& bounds) {
   last_bounds_ = bounds;
 }
 
 }  // namespace
 
 class ViewLayerTest : public ViewsTestBase {
  public:
   ViewLayerTest() : widget_(NULL) {}
 
-  virtual ~ViewLayerTest() {
-  }
+  ~ViewLayerTest() override {}
 
   // Returns the Layer used by the RootView.
   ui::Layer* GetRootLayer() {
     return widget()->GetLayer();
   }
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ViewTest::SetUp();
     widget_ = new Widget;
     Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
     params.bounds = gfx::Rect(50, 50, 200, 200);
     widget_->Init(params);
     widget_->Show();
     widget_->GetRootView()->SetBounds(0, 0, 200, 200);
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     widget_->CloseNow();
     ViewsTestBase::TearDown();
   }
 
   Widget* widget() { return widget_; }
 
  private:
   Widget* widget_;
 };
 
@@ skipping 288 matching lines @@
 }
 
 class PaintTrackingView : public View {
  public:
   PaintTrackingView() : painted_(false) {
   }
 
   bool painted() const { return painted_; }
   void set_painted(bool value) { painted_ = value; }
 
-  virtual void OnPaint(gfx::Canvas* canvas) override {
-    painted_ = true;
-  }
+  void OnPaint(gfx::Canvas* canvas) override { painted_ = true; }
 
  private:
   bool painted_;
 
   DISALLOW_COPY_AND_ASSIGN(PaintTrackingView);
 };
 
 // Makes sure child views with layers aren't painted when paint starts at an
 // ancestor.
 TEST_F(ViewLayerTest, DontPaintChildrenWithLayers) {
@@ skipping 215 matching lines @@
   ASSERT_TRUE(v.layer() != NULL);
   ASSERT_EQ(2u, v.layer()->children().size());
   EXPECT_EQ(v.layer()->children()[0], &layer);
   EXPECT_EQ(v.layer()->children()[1], child.layer());
 }
 
 class BoundsTreeTestView : public View {
  public:
   BoundsTreeTestView() {}
 
-  virtual void PaintChildren(gfx::Canvas* canvas,
-                             const CullSet& cull_set) override {
+  void PaintChildren(gfx::Canvas* canvas, const CullSet& cull_set) override {
     // Save out a copy of the cull_set before calling the base implementation.
     last_cull_set_.clear();
     if (cull_set.cull_set_) {
       for (base::hash_set<intptr_t>::iterator it = cull_set.cull_set_->begin();
            it != cull_set.cull_set_->end();
            ++it) {
         last_cull_set_.insert(reinterpret_cast<View*>(*it));
       }
     }
     View::PaintChildren(canvas, cull_set);
@@ skipping 375 matching lines @@
   // notification.
   TestView* test_view_child_2 = new TestView();
   test_view->AddChildView(test_view_child_2);
   EXPECT_TRUE(test_view_child_2->native_theme_);
   EXPECT_EQ(widget->GetNativeTheme(), test_view_child_2->native_theme_);
 
   widget->CloseNow();
 }
 
 }  // namespace views