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

Unified Diff: ui/views/widget/root_view_unittest.cc

Issue 686493002: 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/widget/root_view_targeter.h ('k') | ui/views/widget/tooltip_manager_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/root_view_unittest.cc
diff --git a/ui/views/widget/root_view_unittest.cc b/ui/views/widget/root_view_unittest.cc
index 21b1cc2847dc34cdb04b21248cfb410ca2823946..fcefb7033020c19e0e19b8890838937b54e233f4 100644
--- a/ui/views/widget/root_view_unittest.cc
+++ b/ui/views/widget/root_view_unittest.cc
@@ -17,9 +17,9 @@ typedef ViewsTestBase RootViewTest;
class DeleteOnKeyEventView : public View {
public:
explicit DeleteOnKeyEventView(bool* set_on_key) : set_on_key_(set_on_key) {}
- virtual ~DeleteOnKeyEventView() {}
+ ~DeleteOnKeyEventView() override {}
- virtual bool OnKeyPressed(const ui::KeyEvent& event) override {
+ bool OnKeyPressed(const ui::KeyEvent& event) override {
*set_on_key_ = true;
delete this;
return true;
@@ -73,7 +73,7 @@ class TestContextMenuController : public ContextMenuController {
menu_source_view_(NULL),
menu_source_type_(ui::MENU_SOURCE_NONE) {
}
- virtual ~TestContextMenuController() {}
+ ~TestContextMenuController() override {}
int show_context_menu_calls() const { return show_context_menu_calls_; }
View* menu_source_view() const { return menu_source_view_; }
@@ -86,10 +86,9 @@ class TestContextMenuController : public ContextMenuController {
}
// ContextMenuController:
- virtual void ShowContextMenuForView(
- View* source,
- const gfx::Point& point,
- ui::MenuSourceType source_type) override {
+ void ShowContextMenuForView(View* source,
+ const gfx::Point& point,
+ ui::MenuSourceType source_type) override {
show_context_menu_calls_++;
menu_source_view_ = source;
menu_source_type_ = source_type;
@@ -160,12 +159,9 @@ class GestureHandlingView : public View {
GestureHandlingView() {
}
- virtual ~GestureHandlingView() {
- }
+ ~GestureHandlingView() override {}
- virtual void OnGestureEvent(ui::GestureEvent* event) override {
- event->SetHandled();
- }
+ void OnGestureEvent(ui::GestureEvent* event) override { event->SetHandled(); }
private:
DISALLOW_COPY_AND_ASSIGN(GestureHandlingView);
« no previous file with comments | « ui/views/widget/root_view_targeter.h ('k') | ui/views/widget/tooltip_manager_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698