Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2051)

Unified Diff: ui/views/controls/textfield/textfield_unittest.cc

Issue 680023003: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/textfield/textfield_model_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/textfield/textfield_unittest.cc
diff --git a/ui/views/controls/textfield/textfield_unittest.cc b/ui/views/controls/textfield/textfield_unittest.cc
index 560bb41bc1e564cb447fe489e09793caefcbc74f..0e6c96625c944f9f757541b78911c4546212117e 100644
--- a/ui/views/controls/textfield/textfield_unittest.cc
+++ b/ui/views/controls/textfield/textfield_unittest.cc
@@ -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(); }
msw 2014/10/27 20:43:57 nit: I guess this can be removed altogether!
dcheng 2014/10/27 20:46:36 o.O Let me clean this up in a followup, given the
msw 2014/10/27 20:47:44 Even doing this in a followup is optional for you.
- 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;
« no previous file with comments | « ui/views/controls/textfield/textfield_model_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698