Commit 0a5ed8fe authored by dcheng's avatar dcheng Committed by Commit bot

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

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

Cr-Commit-Position: refs/heads/master@{#301456}
parent 9ab9844c
This diff is collapsed.
......@@ -160,7 +160,7 @@ class InsertEdit : public Edit {
}
// Edit implementation.
virtual bool DoMerge(const Edit* edit) override {
bool DoMerge(const Edit* edit) override {
if (edit->type() != INSERT_EDIT || new_text_end() != edit->new_text_start_)
return false;
// If continuous edit, merge it.
......@@ -193,7 +193,7 @@ class ReplaceEdit : public Edit {
}
// Edit implementation.
virtual bool DoMerge(const Edit* edit) override {
bool DoMerge(const Edit* edit) override {
if (edit->type() == DELETE_EDIT ||
new_text_end() != edit->old_text_start_ ||
edit->old_text_start_ != edit->new_text_start_)
......@@ -223,7 +223,7 @@ class DeleteEdit : public Edit {
}
// Edit implementation.
virtual bool DoMerge(const Edit* edit) override {
bool DoMerge(const Edit* edit) override {
if (edit->type() != DELETE_EDIT)
return false;
......
......@@ -50,7 +50,7 @@ class TextfieldModelTest : public ViewsTestBase,
composition_text_confirmed_or_cleared_(false) {
}
virtual void OnCompositionTextConfirmedOrCleared() override {
void OnCompositionTextConfirmedOrCleared() override {
composition_text_confirmed_or_cleared_ = true;
}
......
......@@ -64,7 +64,7 @@ class TestTextfield : public views::Textfield {
key_received_(false),
weak_ptr_factory_(this) {}
virtual bool OnKeyPressed(const ui::KeyEvent& e) override {
bool OnKeyPressed(const ui::KeyEvent& e) override {
key_received_ = true;
// Since OnKeyPressed() might destroy |this|, get a weak pointer and
......@@ -80,7 +80,7 @@ class TestTextfield : public views::Textfield {
return key_handled_;
}
virtual bool OnKeyReleased(const ui::KeyEvent& e) override {
bool OnKeyReleased(const ui::KeyEvent& e) override {
key_received_ = true;
key_handled_ = views::Textfield::OnKeyReleased(e);
return key_handled_;
......@@ -122,8 +122,8 @@ class TextfieldDestroyerController : public views::TextfieldController {
views::Textfield* target() { return target_.get(); }
// views::TextfieldController:
virtual bool HandleKeyEvent(views::Textfield* sender,
const ui::KeyEvent& key_event) override {
bool HandleKeyEvent(views::Textfield* sender,
const ui::KeyEvent& key_event) override {
target_.reset();
return false;
}
......@@ -159,11 +159,9 @@ class TextfieldTest : public ViewsTestBase, public TextfieldController {
}
// ::testing::Test:
virtual void SetUp() {
ViewsTestBase::SetUp();
}
void SetUp() override { ViewsTestBase::SetUp(); }
virtual void TearDown() {
void TearDown() override {
if (widget_)
widget_->Close();
ViewsTestBase::TearDown();
......@@ -176,23 +174,23 @@ class TextfieldTest : public ViewsTestBase, public TextfieldController {
}
// TextfieldController:
virtual void ContentsChanged(Textfield* sender,
const base::string16& new_contents) override {
void ContentsChanged(Textfield* sender,
const base::string16& new_contents) override {
// Paste calls TextfieldController::ContentsChanged() explicitly even if the
// paste action did not change the content. So |new_contents| may match
// |last_contents_|. For more info, see http://crbug.com/79002
last_contents_ = new_contents;
}
virtual void OnBeforeUserAction(Textfield* sender) override {
void OnBeforeUserAction(Textfield* sender) override {
++on_before_user_action_;
}
virtual void OnAfterUserAction(Textfield* sender) override {
void OnAfterUserAction(Textfield* sender) override {
++on_after_user_action_;
}
virtual void OnAfterCutOrCopy(ui::ClipboardType clipboard_type) override {
void OnAfterCutOrCopy(ui::ClipboardType clipboard_type) override {
copied_to_clipboard_ = clipboard_type;
}
......@@ -628,9 +626,9 @@ TEST_F(TextfieldTest, OnKeyPressBinding) {
class TestDelegate : public ui::TextEditKeyBindingsDelegateAuraLinux {
public:
TestDelegate() {}
virtual ~TestDelegate() {}
~TestDelegate() override {}
virtual bool MatchEvent(
bool MatchEvent(
const ui::Event& event,
std::vector<ui::TextEditCommandAuraLinux>* commands) override {
return false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment