Standardize usage of virtual/override/final specifiers.

The Google C++ style guide states:

  Explicitly annotate overrides of virtual functions or virtual
  destructors with an override or (less frequently) final specifier.
  Older (pre-C++11) code will use the virtual keyword as an inferior
  alternative annotation. For clarity, use exactly one of override,
  final, or virtual when declaring an override.

To better conform to these guidelines, the following constructs have
been rewritten:

- if a base class has a virtual destructor, then:
    virtual ~Foo();                   ->  ~Foo() override;
- virtual void Foo() override;        ->  void Foo() override;
- virtual void Foo() override final;  ->  void Foo() final;

This patch was automatically generated. The clang plugin can generate
fixit hints, which are suggested edits when it is 100% sure it knows how
to fix a problem. The hints from the clang plugin were applied to the
source tree using the tool in https://codereview.chromium.org/598073004.

BUG=417463
R=avi@chromium.org

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

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

9 files changed, 80 insertions, 87 deletions

diff --git a/ui/views/bubble/bubble_border.h b/ui/views/bubble/bubble_border.h
index 8fc149b..4e60fb0 100644
--- a/ui/views/bubble/bubble_border.h
+++ b/ui/views/bubble/bubble_border.h
@@ -109,7 +109,7 @@ class VIEWS_EXPORT BubbleBorder : public Border {
   };
 
   BubbleBorder(Arrow arrow, Shadow shadow, SkColor color);
-  virtual ~BubbleBorder();
+  ~BubbleBorder() override;
 
   // Returns the radius of the corner of the border.
   // TODO(xiyuan): Get rid of this since it's part of BorderImages now?
@@ -196,9 +196,9 @@ class VIEWS_EXPORT BubbleBorder : public Border {
   int GetArrowOffset(const gfx::Size& border_size) const;
 
   // Overridden from Border:
-  virtual void Paint(const View& view, gfx::Canvas* canvas) override;
-  virtual gfx::Insets GetInsets() const override;
-  virtual gfx::Size GetMinimumSize() const override;
+  void Paint(const View& view, gfx::Canvas* canvas) override;
+  gfx::Insets GetInsets() const override;
+  gfx::Size GetMinimumSize() const override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(BubbleBorderTest, GetSizeForContentsSizeTest);
@@ -233,7 +233,7 @@ class VIEWS_EXPORT BubbleBackground : public Background {
   explicit BubbleBackground(BubbleBorder* border) : border_(border) {}
 
   // Overridden from Background:
-  virtual void Paint(gfx::Canvas* canvas, View* view) const override;
+  void Paint(gfx::Canvas* canvas, View* view) const override;
 
  private:
   BubbleBorder* border_;
diff --git a/ui/views/bubble/bubble_delegate.h b/ui/views/bubble/bubble_delegate.h
index 5f21313..047562d 100644
--- a/ui/views/bubble/bubble_delegate.h
+++ b/ui/views/bubble/bubble_delegate.h
@@ -27,27 +27,25 @@ class VIEWS_EXPORT BubbleDelegateView : public WidgetDelegateView,
  public:
   BubbleDelegateView();
   BubbleDelegateView(View* anchor_view, BubbleBorder::Arrow arrow);
-  virtual ~BubbleDelegateView();
+  ~BubbleDelegateView() override;
 
   // Create and initialize the bubble Widget(s) with proper bounds.
   static Widget* CreateBubble(BubbleDelegateView* bubble_delegate);
 
   // WidgetDelegateView overrides:
-  virtual BubbleDelegateView* AsBubbleDelegate() override;
-  virtual bool ShouldShowCloseButton() const override;
-  virtual View* GetContentsView() override;
-  virtual NonClientFrameView* CreateNonClientFrameView(Widget* widget) override;
-  virtual void GetAccessibleState(ui::AXViewState* state) override;
+  BubbleDelegateView* AsBubbleDelegate() override;
+  bool ShouldShowCloseButton() const override;
+  View* GetContentsView() override;
+  NonClientFrameView* CreateNonClientFrameView(Widget* widget) override;
+  void GetAccessibleState(ui::AXViewState* state) override;
 
   // WidgetObserver overrides:
-  virtual void OnWidgetDestroying(Widget* widget) override;
-  virtual void OnWidgetVisibilityChanging(Widget* widget, bool visible)
-      override;
-  virtual void OnWidgetVisibilityChanged(Widget* widget, bool visible)
-      override;
-  virtual void OnWidgetActivationChanged(Widget* widget, bool active) override;
-  virtual void OnWidgetBoundsChanged(Widget* widget,
-                                     const gfx::Rect& new_bounds) override;
+  void OnWidgetDestroying(Widget* widget) override;
+  void OnWidgetVisibilityChanging(Widget* widget, bool visible) override;
+  void OnWidgetVisibilityChanged(Widget* widget, bool visible) override;
+  void OnWidgetActivationChanged(Widget* widget, bool active) override;
+  void OnWidgetBoundsChanged(Widget* widget,
+                             const gfx::Rect& new_bounds) override;
 
   bool close_on_esc() const { return close_on_esc_; }
   void set_close_on_esc(bool close_on_esc) { close_on_esc_ = close_on_esc; }
@@ -119,8 +117,8 @@ class VIEWS_EXPORT BubbleDelegateView : public WidgetDelegateView,
   virtual const gfx::FontList& GetTitleFontList() const;
 
   // View overrides:
-  virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
-  virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
+  bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
+  void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
 
   // Perform view initialization on the contents for bubble sizing.
   virtual void Init();
diff --git a/ui/views/bubble/bubble_delegate_unittest.cc b/ui/views/bubble/bubble_delegate_unittest.cc
index c793f54..782c9e7 100644
--- a/ui/views/bubble/bubble_delegate_unittest.cc
+++ b/ui/views/bubble/bubble_delegate_unittest.cc
@@ -22,7 +22,7 @@ class TestBubbleDelegateView : public BubbleDelegateView {
     view_->SetFocusable(true);
     AddChildView(view_);
   }
-  virtual ~TestBubbleDelegateView() {}
+  ~TestBubbleDelegateView() override {}
 
   void SetAnchorRectForTest(gfx::Rect rect) {
     SetAnchorRect(rect);
@@ -33,10 +33,8 @@ class TestBubbleDelegateView : public BubbleDelegateView {
   }
 
   // BubbleDelegateView overrides:
-  virtual View* GetInitiallyFocusedView() override { return view_; }
-  virtual gfx::Size GetPreferredSize() const override {
-    return gfx::Size(200, 200);
-  }
+  View* GetInitiallyFocusedView() override { return view_; }
+  gfx::Size GetPreferredSize() const override { return gfx::Size(200, 200); }
 
  private:
   View* view_;
@@ -47,7 +45,7 @@ class TestBubbleDelegateView : public BubbleDelegateView {
 class BubbleDelegateTest : public ViewsTestBase {
  public:
   BubbleDelegateTest() {}
-  virtual ~BubbleDelegateTest() {}
+  ~BubbleDelegateTest() override {}
 
   // Creates a test widget that owns its native widget.
   Widget* CreateTestWidget() {
diff --git a/ui/views/bubble/bubble_frame_view.h b/ui/views/bubble/bubble_frame_view.h
index 1d3add7..cfe1433 100644
--- a/ui/views/bubble/bubble_frame_view.h
+++ b/ui/views/bubble/bubble_frame_view.h
@@ -30,7 +30,7 @@ class VIEWS_EXPORT BubbleFrameView : public NonClientFrameView,
   static const char kViewClassName[];
 
   explicit BubbleFrameView(const gfx::Insets& content_margins);
-  virtual ~BubbleFrameView();
+  ~BubbleFrameView() override;
 
   // Insets to make bubble contents align horizontal with the bubble title.
   // NOTE: this does not take into account whether a title actually exists.
@@ -40,33 +40,32 @@ class VIEWS_EXPORT BubbleFrameView : public NonClientFrameView,
   static LabelButton* CreateCloseButton(ButtonListener* listener);
 
   // NonClientFrameView overrides:
-  virtual gfx::Rect GetBoundsForClientView() const override;
-  virtual gfx::Rect GetWindowBoundsForClientBounds(
+  gfx::Rect GetBoundsForClientView() const override;
+  gfx::Rect GetWindowBoundsForClientBounds(
       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;
+  int NonClientHitTest(const gfx::Point& point) override;
+  void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask) override;
+  void ResetWindowControls() override;
+  void UpdateWindowIcon() override;
+  void UpdateWindowTitle() override;
+  void SizeConstraintsChanged() override;
 
   // Set the FontList to be used for the title of the bubble.
   // Caller must arrange to update the layout to have the call take effect.
   void SetTitleFontList(const gfx::FontList& font_list);
 
   // View overrides:
-  virtual gfx::Insets GetInsets() const override;
-  virtual gfx::Size GetPreferredSize() const override;
-  virtual gfx::Size GetMinimumSize() const override;
-  virtual void Layout() override;
-  virtual const char* GetClassName() const override;
-  virtual void ChildPreferredSizeChanged(View* child) override;
-  virtual void OnThemeChanged() override;
-  virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
+  gfx::Insets GetInsets() const override;
+  gfx::Size GetPreferredSize() const override;
+  gfx::Size GetMinimumSize() const override;
+  void Layout() override;
+  const char* GetClassName() const override;
+  void ChildPreferredSizeChanged(View* child) override;
+  void OnThemeChanged() override;
+  void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
 
   // Overridden from ButtonListener:
-  virtual void ButtonPressed(Button* sender, const ui::Event& event) override;
+  void ButtonPressed(Button* sender, const ui::Event& event) override;
 
   // Use bubble_border() and SetBubbleBorder(), not border() and SetBorder().
   BubbleBorder* bubble_border() const { return bubble_border_; }
diff --git a/ui/views/bubble/bubble_frame_view_unittest.cc b/ui/views/bubble/bubble_frame_view_unittest.cc
index 545ca38..17fd942 100644
--- a/ui/views/bubble/bubble_frame_view_unittest.cc
+++ b/ui/views/bubble/bubble_frame_view_unittest.cc
@@ -26,10 +26,10 @@ class TestBubbleFrameView : public BubbleFrameView {
     SetBubbleBorder(scoped_ptr<views::BubbleBorder>(
         new BubbleBorder(kArrow, BubbleBorder::NO_SHADOW, kColor)));
   }
-  virtual ~TestBubbleFrameView() {}
+  ~TestBubbleFrameView() override {}
 
   // BubbleFrameView overrides:
-  virtual gfx::Rect GetAvailableScreenBounds(const gfx::Rect& rect) override {
+  gfx::Rect GetAvailableScreenBounds(const gfx::Rect& rect) override {
     return available_bounds_;
   }
 
diff --git a/ui/views/bubble/bubble_window_targeter.h b/ui/views/bubble/bubble_window_targeter.h
index b37eaa0..129a9ce 100644
--- a/ui/views/bubble/bubble_window_targeter.h
+++ b/ui/views/bubble/bubble_window_targeter.h
@@ -18,12 +18,11 @@ class VIEWS_EXPORT BubbleWindowTargeter
     : public NON_EXPORTED_BASE(wm::MaskedWindowTargeter) {
  public:
   explicit BubbleWindowTargeter(BubbleDelegateView* bubble);
-  virtual ~BubbleWindowTargeter();
+  ~BubbleWindowTargeter() override;
 
  private:
   // wm::MaskedWindowTargeter:
-  virtual bool GetHitTestMask(aura::Window* window,
-                              gfx::Path* mask) const override;
+  bool GetHitTestMask(aura::Window* window, gfx::Path* mask) const override;
 
   views::BubbleDelegateView* bubble_;
 
diff --git a/ui/views/bubble/bubble_window_targeter_unittest.cc b/ui/views/bubble/bubble_window_targeter_unittest.cc
index 4ff0e0a..be39081 100644
--- a/ui/views/bubble/bubble_window_targeter_unittest.cc
+++ b/ui/views/bubble/bubble_window_targeter_unittest.cc
@@ -21,12 +21,12 @@ class WidgetOwnsNativeBubble : public BubbleDelegateView {
       : BubbleDelegateView(content, arrow) {
   }
 
-  virtual ~WidgetOwnsNativeBubble() {}
+  ~WidgetOwnsNativeBubble() override {}
 
  private:
   // BubbleDelegateView:
-  virtual void OnBeforeBubbleWidgetInit(Widget::InitParams* params,
-                                        Widget* widget) const override {
+  void OnBeforeBubbleWidgetInit(Widget::InitParams* params,
+                                Widget* widget) const override {
     params->ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   }
 
@@ -40,9 +40,9 @@ class BubbleWindowTargeterTest : public ViewsTestBase {
   BubbleWindowTargeterTest()
       : bubble_delegate_(NULL) {
   }
-  virtual ~BubbleWindowTargeterTest() {}
+  ~BubbleWindowTargeterTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ViewsTestBase::SetUp();
     CreateAnchorWidget();
     CreateBubbleWidget();
@@ -51,7 +51,7 @@ class BubbleWindowTargeterTest : public ViewsTestBase {
     bubble_widget()->Show();
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     bubble_delegate_ = NULL;
     bubble_widget_.reset();
     anchor_.reset();
diff --git a/ui/views/bubble/tray_bubble_view.cc b/ui/views/bubble/tray_bubble_view.cc
index 53cb526..4d231a7d 100644
--- a/ui/views/bubble/tray_bubble_view.cc
+++ b/ui/views/bubble/tray_bubble_view.cc
@@ -53,10 +53,10 @@ namespace internal {
 class MouseMoveDetectorHost : public MouseWatcherHost {
  public:
   MouseMoveDetectorHost();
-  virtual ~MouseMoveDetectorHost();
+  ~MouseMoveDetectorHost() override;
+
+  bool Contains(const gfx::Point& screen_point, MouseEventType type) override;
 
-  virtual bool Contains(const gfx::Point& screen_point,
-                        MouseEventType type) override;
  private:
   DISALLOW_COPY_AND_ASSIGN(MouseMoveDetectorHost);
 };
@@ -89,12 +89,12 @@ class TrayBubbleBorder : public BubbleBorder {
     set_paint_arrow(params.arrow_paint_type);
   }
 
-  virtual ~TrayBubbleBorder() {}
+  ~TrayBubbleBorder() override {}
 
   // Overridden from BubbleBorder.
   // Sets the bubble on top of the anchor when it has no arrow.
-  virtual gfx::Rect GetBounds(const gfx::Rect& position_relative_to,
-                              const gfx::Size& contents_size) const override {
+  gfx::Rect GetBounds(const gfx::Rect& position_relative_to,
+                      const gfx::Size& contents_size) const override {
     if (has_arrow(arrow())) {
       gfx::Rect rect =
           BubbleBorder::GetBounds(position_relative_to, contents_size);
@@ -177,16 +177,15 @@ class TrayBubbleBorder : public BubbleBorder {
 class TrayBubbleContentMask : public ui::LayerDelegate {
  public:
   explicit TrayBubbleContentMask(int corner_radius);
-  virtual ~TrayBubbleContentMask();
+  ~TrayBubbleContentMask() override;
 
   ui::Layer* layer() { return &layer_; }
 
   // Overridden from LayerDelegate.
-  virtual void OnPaintLayer(gfx::Canvas* canvas) override;
-  virtual void OnDelegatedFrameDamage(
-      const gfx::Rect& damage_rect_in_dip) override {}
-  virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override;
-  virtual base::Closure PrepareForLayerBoundsChange() override;
+  void OnPaintLayer(gfx::Canvas* canvas) override;
+  void OnDelegatedFrameDamage(const gfx::Rect& damage_rect_in_dip) override {}
+  void OnDeviceScaleFactorChanged(float device_scale_factor) override;
+  base::Closure PrepareForLayerBoundsChange() override;
 
  private:
   ui::Layer layer_;
@@ -231,10 +230,10 @@ class BottomAlignedBoxLayout : public BoxLayout {
         bubble_view_(bubble_view) {
   }
 
-  virtual ~BottomAlignedBoxLayout() {}
+  ~BottomAlignedBoxLayout() override {}
 
  private:
-  virtual void Layout(View* host) override {
+  void Layout(View* host) override {
     if (host->height() >= host->GetPreferredSize().height() ||
         !bubble_view_->is_gesture_dragging()) {
       BoxLayout::Layout(host);
diff --git a/ui/views/bubble/tray_bubble_view.h b/ui/views/bubble/tray_bubble_view.h
index 8ffd58d..4bcb7fe 100644
--- a/ui/views/bubble/tray_bubble_view.h
+++ b/ui/views/bubble/tray_bubble_view.h
@@ -117,7 +117,7 @@ class VIEWS_EXPORT TrayBubbleView : public views::BubbleDelegateView,
                                 Delegate* delegate,
                                 InitParams* init_params);
 
-  virtual ~TrayBubbleView();
+  ~TrayBubbleView() override;
 
   // Sets up animations, and show the bubble. Must occur after CreateBubble()
   // is called.
@@ -147,25 +147,25 @@ class VIEWS_EXPORT TrayBubbleView : public views::BubbleDelegateView,
   bool is_gesture_dragging() const { return is_gesture_dragging_; }
 
   // Overridden from views::WidgetDelegate.
-  virtual bool CanActivate() const override;
-  virtual views::NonClientFrameView* CreateNonClientFrameView(
+  bool CanActivate() const override;
+  views::NonClientFrameView* CreateNonClientFrameView(
       views::Widget* widget) override;
-  virtual bool WidgetHasHitTestMask() const override;
-  virtual void GetWidgetHitTestMask(gfx::Path* mask) const override;
+  bool WidgetHasHitTestMask() const override;
+  void GetWidgetHitTestMask(gfx::Path* mask) const override;
 
   // Overridden from views::BubbleDelegateView.
-  virtual gfx::Rect GetAnchorRect() const override;
+  gfx::Rect GetAnchorRect() const override;
 
   // Overridden from views::View.
-  virtual gfx::Size GetPreferredSize() const override;
-  virtual gfx::Size GetMaximumSize() const override;
-  virtual int GetHeightForWidth(int width) const override;
-  virtual void OnMouseEntered(const ui::MouseEvent& event) override;
-  virtual void OnMouseExited(const ui::MouseEvent& event) override;
-  virtual void GetAccessibleState(ui::AXViewState* state) override;
+  gfx::Size GetPreferredSize() const override;
+  gfx::Size GetMaximumSize() const override;
+  int GetHeightForWidth(int width) const override;
+  void OnMouseEntered(const ui::MouseEvent& event) override;
+  void OnMouseExited(const ui::MouseEvent& event) override;
+  void GetAccessibleState(ui::AXViewState* state) override;
 
   // Overridden from MouseWatcherListener
-  virtual void MouseMovedOutOfHost() override;
+  void MouseMovedOutOfHost() override;
 
  protected:
   TrayBubbleView(gfx::NativeView parent_window,
@@ -174,11 +174,11 @@ class VIEWS_EXPORT TrayBubbleView : public views::BubbleDelegateView,
                  const InitParams& init_params);
 
   // Overridden from views::BubbleDelegateView.
-  virtual void Init() override;
+  void Init() override;
 
   // Overridden from views::View.
-  virtual void ChildPreferredSizeChanged(View* child) override;
-  virtual void ViewHierarchyChanged(
+  void ChildPreferredSizeChanged(View* child) override;
+  void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) override;
 
  private: