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=derat@chromium.org

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

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

11 files changed, 39 insertions, 46 deletions

diff --git a/ash/ime/candidate_view.cc b/ash/ime/candidate_view.cc
index 0cafbe1..b13cb0a 100644
--- a/ash/ime/candidate_view.cc
+++ b/ash/ime/candidate_view.cc
@@ -26,11 +26,11 @@ class VerticalCandidateLabel : public views::Label {
   VerticalCandidateLabel() {}
 
  private:
-  virtual ~VerticalCandidateLabel() {}
+  ~VerticalCandidateLabel() override {}
 
   // Returns the preferred size, but guarantees that the width has at
   // least kMinCandidateLabelWidth pixels.
-  virtual gfx::Size GetPreferredSize() const override {
+  gfx::Size GetPreferredSize() const override {
     gfx::Size size = Label::GetPreferredSize();
     size.SetToMax(gfx::Size(kMinCandidateLabelWidth, 0));
     size.SetToMin(gfx::Size(kMaxCandidateLabelWidth, size.height()));
diff --git a/ash/ime/candidate_view.h b/ash/ime/candidate_view.h
index f800a40..6b1c650 100644
--- a/ash/ime/candidate_view.h
+++ b/ash/ime/candidate_view.h
@@ -20,7 +20,7 @@ class ASH_EXPORT CandidateView : public views::CustomButton {
  public:
   CandidateView(views::ButtonListener* listener,
                 ui::CandidateWindow::Orientation orientation);
-  virtual ~CandidateView() {}
+  ~CandidateView() override {}
 
   void GetPreferredWidths(int* shortcut_width,
                           int* candidate_width);
@@ -40,12 +40,12 @@ class ASH_EXPORT CandidateView : public views::CustomButton {
   FRIEND_TEST_ALL_PREFIXES(CandidateWindowViewTest, ShortcutSettingTest);
 
   // Overridden from views::CustomButton:
-  virtual void StateChanged() override;
+  void StateChanged() override;
 
   // Overridden from View:
-  virtual bool OnMouseDragged(const ui::MouseEvent& event) override;
-  virtual void Layout() override;
-  virtual gfx::Size GetPreferredSize() const override;
+  bool OnMouseDragged(const ui::MouseEvent& event) override;
+  void Layout() override;
+  gfx::Size GetPreferredSize() const override;
 
   // The orientation of the candidate view.
   ui::CandidateWindow::Orientation orientation_;
diff --git a/ash/ime/candidate_view_unittest.cc b/ash/ime/candidate_view_unittest.cc
index a7396eb..5b6feaa 100644
--- a/ash/ime/candidate_view_unittest.cc
+++ b/ash/ime/candidate_view_unittest.cc
@@ -30,9 +30,9 @@ class CandidateViewTest : public views::ViewsTestBase,
                           public views::ButtonListener {
  public:
   CandidateViewTest() : widget_(NULL), last_pressed_(NULL) {}
-  virtual ~CandidateViewTest() {}
+  ~CandidateViewTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     views::ViewsTestBase::SetUp();
 
     views::Widget::InitParams init_params(CreateParams(
@@ -61,7 +61,7 @@ class CandidateViewTest : public views::ViewsTestBase,
         native_window->GetRootWindow(), native_window));
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     widget_->Close();
 
     views::ViewsTestBase::TearDown();
@@ -100,8 +100,7 @@ class CandidateViewTest : public views::ViewsTestBase,
   ui::test::EventGenerator* event_generator() { return event_generator_.get(); }
 
  private:
-  virtual void ButtonPressed(views::Button* sender,
-                             const ui::Event& event) override {
+  void ButtonPressed(views::Button* sender, const ui::Event& event) override {
     last_pressed_ = sender;
   }
 
diff --git a/ash/ime/candidate_window_view.cc b/ash/ime/candidate_window_view.cc
index af71647..66b54d5 100644
--- a/ash/ime/candidate_window_view.cc
+++ b/ash/ime/candidate_window_view.cc
@@ -35,14 +35,14 @@ class CandidateWindowBorder : public views::BubbleBorder {
         offset_(0) {
     set_paint_arrow(views::BubbleBorder::PAINT_NONE);
   }
-  virtual ~CandidateWindowBorder() {}
+  ~CandidateWindowBorder() override {}
 
   void set_offset(int offset) { offset_ = offset; }
 
  private:
   // Overridden from views::BubbleBorder:
-  virtual gfx::Rect GetBounds(const gfx::Rect& anchor_rect,
-                              const gfx::Size& content_size) const override {
+  gfx::Rect GetBounds(const gfx::Rect& anchor_rect,
+                      const gfx::Size& content_size) const override {
     gfx::Rect bounds(content_size);
     bounds.set_origin(gfx::Point(
         anchor_rect.x() - offset_,
@@ -62,9 +62,7 @@ class CandidateWindowBorder : public views::BubbleBorder {
     return bounds;
   }
 
-  virtual gfx::Insets GetInsets() const override {
-    return gfx::Insets();
-  }
+  gfx::Insets GetInsets() const override { return gfx::Insets(); }
 
   gfx::NativeView parent_;
   int offset_;
@@ -130,7 +128,7 @@ class InformationTextArea : public views::View {
   }
 
  protected:
-  virtual gfx::Size GetPreferredSize() const override {
+  gfx::Size GetPreferredSize() const override {
     gfx::Size size = views::View::GetPreferredSize();
     size.SetToMax(gfx::Size(min_width_, 0));
     return size;
diff --git a/ash/ime/candidate_window_view.h b/ash/ime/candidate_window_view.h
index 4cbc5b7..99800f8 100644
--- a/ash/ime/candidate_window_view.h
+++ b/ash/ime/candidate_window_view.h
@@ -29,7 +29,7 @@ class ASH_EXPORT CandidateWindowView : public views::BubbleDelegateView,
   };
 
   explicit CandidateWindowView(gfx::NativeView parent);
-  virtual ~CandidateWindowView();
+  ~CandidateWindowView() override;
   views::Widget* InitWidget();
 
   // Adds the given observer. The ownership is not transferred.
@@ -74,8 +74,7 @@ class ASH_EXPORT CandidateWindowView : public views::BubbleDelegateView,
   friend class CandidateWindowViewTest;
 
   // Overridden from views::ButtonListener:
-  virtual void ButtonPressed(views::Button* sender,
-                             const ui::Event& event) override;
+  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
   void SelectCandidateAt(int index_in_page);
   void UpdateVisibility();
diff --git a/ash/ime/candidate_window_view_unittest.cc b/ash/ime/candidate_window_view_unittest.cc
index b0295fe..dd523b5 100644
--- a/ash/ime/candidate_window_view_unittest.cc
+++ b/ash/ime/candidate_window_view_unittest.cc
@@ -65,10 +65,10 @@ void InitCandidateWindowWithCandidatesFilled(
 class CandidateWindowViewTest : public views::ViewsTestBase {
  public:
   CandidateWindowViewTest() {}
-  virtual ~CandidateWindowViewTest() {}
+  ~CandidateWindowViewTest() override {}
 
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     views::ViewsTestBase::SetUp();
     candidate_window_view_ = new CandidateWindowView(GetContext());
     candidate_window_view_->InitWidget();
diff --git a/ash/ime/infolist_window.cc b/ash/ime/infolist_window.cc
index 3467b87..dec8b73 100644
--- a/ash/ime/infolist_window.cc
+++ b/ash/ime/infolist_window.cc
@@ -40,12 +40,12 @@ const int kInfolistHideDelayMilliSeconds = 500;
 class InfolistBorder : public views::BubbleBorder {
  public:
   InfolistBorder();
-  virtual ~InfolistBorder();
+  ~InfolistBorder() override;
 
   // views::BubbleBorder implementation.
-  virtual gfx::Rect GetBounds(const gfx::Rect& anchor_rect,
-                              const gfx::Size& contents_size) const override;
-  virtual gfx::Insets GetInsets() const override;
+  gfx::Rect GetBounds(const gfx::Rect& anchor_rect,
+                      const gfx::Size& contents_size) const override;
+  gfx::Insets GetInsets() const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InfolistBorder);
@@ -88,13 +88,13 @@ class InfolistEntryView : public views::View {
   InfolistEntryView(const ui::InfolistEntry& entry,
                     const gfx::FontList& title_font_list,
                     const gfx::FontList& description_font_list);
-  virtual ~InfolistEntryView();
+  ~InfolistEntryView() override;
 
   void SetEntry(const ui::InfolistEntry& entry);
 
  private:
   // views::View implementation.
-  virtual gfx::Size GetPreferredSize() const override;
+  gfx::Size GetPreferredSize() const override;
 
   void UpdateBackground();
 
diff --git a/ash/ime/infolist_window.h b/ash/ime/infolist_window.h
index 345c1a1..535f025 100644
--- a/ash/ime/infolist_window.h
+++ b/ash/ime/infolist_window.h
@@ -26,7 +26,7 @@ class ASH_EXPORT InfolistWindow : public views::BubbleDelegateView {
  public:
   InfolistWindow(views::View* candidate_window,
                  const std::vector<ui::InfolistEntry>& entries);
-  virtual ~InfolistWindow();
+  ~InfolistWindow() override;
   void InitWidget();
 
   // Updates infolist contents with |entries|.
@@ -42,7 +42,7 @@ class ASH_EXPORT InfolistWindow : public views::BubbleDelegateView {
 
  private:
   // views::WidgetDelegate implementation.
-  virtual void WindowClosing() override;
+  void WindowClosing() override;
 
   // The list of visible entries. Owned by views hierarchy.
   std::vector<InfolistEntryView*> entry_views_;
diff --git a/ash/ime/input_method_menu_manager_unittest.cc b/ash/ime/input_method_menu_manager_unittest.cc
index e843cf3..d4a62b1 100644
--- a/ash/ime/input_method_menu_manager_unittest.cc
+++ b/ash/ime/input_method_menu_manager_unittest.cc
@@ -18,11 +18,10 @@ TEST(InputMethodMenuManagerTest, TestGetSingleton) {
 class MockObserver : public InputMethodMenuManager::Observer {
  public:
   MockObserver() : input_method_menu_item_changed_count_(0) {}
-  virtual ~MockObserver() {}
+  ~MockObserver() override {}
 
   // Called when the list of menu items is changed.
-  virtual void InputMethodMenuItemChanged(
-      InputMethodMenuManager* manager) override {
+  void InputMethodMenuItemChanged(InputMethodMenuManager* manager) override {
     input_method_menu_item_changed_count_++;
   }
   int input_method_menu_item_changed_count_;
@@ -32,15 +31,13 @@ class InputMethodMenuManagerStatefulTest : public testing::Test{
  public:
   InputMethodMenuManagerStatefulTest()
       : observer_(new MockObserver()) {}
-  virtual ~InputMethodMenuManagerStatefulTest() {}
-  virtual void SetUp() override {
+  ~InputMethodMenuManagerStatefulTest() override {}
+  void SetUp() override {
     menu_manager_ = InputMethodMenuManager::GetInstance();
     menu_manager_->AddObserver(observer_.get());
   }
 
-  virtual void TearDown() override {
-    menu_manager_->RemoveObserver(observer_.get());
-  }
+  void TearDown() override { menu_manager_->RemoveObserver(observer_.get()); }
 
   InputMethodMenuManager* menu_manager_;
   scoped_ptr<MockObserver> observer_;
diff --git a/ash/ime/mode_indicator_view.cc b/ash/ime/mode_indicator_view.cc
index 9c16b56..c8df071 100644
--- a/ash/ime/mode_indicator_view.cc
+++ b/ash/ime/mode_indicator_view.cc
@@ -28,11 +28,11 @@ class ModeIndicatorFrameView : public views::BubbleFrameView {
  public:
   explicit ModeIndicatorFrameView(const gfx::Insets& content_margins)
       : views::BubbleFrameView(content_margins) {}
-  virtual ~ModeIndicatorFrameView() {}
+  ~ModeIndicatorFrameView() override {}
 
  private:
   // views::BubbleFrameView overrides:
-  virtual gfx::Rect GetAvailableScreenBounds(const gfx::Rect& rect) override {
+  gfx::Rect GetAvailableScreenBounds(const gfx::Rect& rect) override {
     return gfx::Screen::GetNativeScreen()->GetDisplayNearestPoint(
         rect.CenterPoint()).bounds();
   }
diff --git a/ash/ime/mode_indicator_view.h b/ash/ime/mode_indicator_view.h
index b38997b..9e00ceb 100644
--- a/ash/ime/mode_indicator_view.h
+++ b/ash/ime/mode_indicator_view.h
@@ -25,20 +25,20 @@ class ASH_EXPORT ModeIndicatorView : public views::BubbleDelegateView {
   ModeIndicatorView(gfx::NativeView parent,
                     const gfx::Rect& cursor_bounds,
                     const base::string16& label);
-  virtual ~ModeIndicatorView();
+  ~ModeIndicatorView() override;
 
   // Show the mode indicator then hide with fading animation.
   void ShowAndFadeOut();
 
   // views::BubbleDelegateView override:
-  virtual gfx::Size GetPreferredSize() const override;
+  gfx::Size GetPreferredSize() const override;
 
  protected:
   // views::BubbleDelegateView override:
-  virtual void Init() override;
+  void Init() override;
 
   // views::WidgetDelegateView overrides:
-  virtual views::NonClientFrameView* CreateNonClientFrameView(
+  views::NonClientFrameView* CreateNonClientFrameView(
       views::Widget* widget) override;
 
  private: