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

Unified Diff: ui/views/controls/menu/menu_controller_unittest.cc

Issue 683563002: 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/menu/menu_controller.h ('k') | ui/views/controls/menu/menu_event_dispatcher_linux.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_controller_unittest.cc
diff --git a/ui/views/controls/menu/menu_controller_unittest.cc b/ui/views/controls/menu/menu_controller_unittest.cc
index ba4dd130629a80318eb7173fd884d7c3b521b4fb..7f1ff8fde75ef4ed4cba9997423b9a2175c70713 100644
--- a/ui/views/controls/menu/menu_controller_unittest.cc
+++ b/ui/views/controls/menu/menu_controller_unittest.cc
@@ -32,7 +32,7 @@ namespace {
class TestMenuItemView : public MenuItemView {
public:
TestMenuItemView() : MenuItemView(NULL) {}
- virtual ~TestMenuItemView() {}
+ ~TestMenuItemView() override {}
private:
DISALLOW_COPY_AND_ASSIGN(TestMenuItemView);
@@ -45,7 +45,7 @@ class TestPlatformEventSource : public ui::PlatformEventSource {
ui::DeviceDataManagerX11::CreateInstance();
#endif
}
- virtual ~TestPlatformEventSource() {}
+ ~TestPlatformEventSource() override {}
uint32_t Dispatch(const ui::PlatformEvent& event) {
return DispatchEvent(event);
@@ -58,10 +58,10 @@ class TestPlatformEventSource : public ui::PlatformEventSource {
class TestNullTargeter : public ui::EventTargeter {
public:
TestNullTargeter() {}
- virtual ~TestNullTargeter() {}
+ ~TestNullTargeter() override {}
- virtual ui::EventTarget* FindTargetForEvent(ui::EventTarget* root,
- ui::Event* event) override {
+ ui::EventTarget* FindTargetForEvent(ui::EventTarget* root,
+ ui::Event* event) override {
return NULL;
}
@@ -72,17 +72,16 @@ class TestNullTargeter : public ui::EventTargeter {
class TestDispatcherClient : public aura::client::DispatcherClient {
public:
TestDispatcherClient() : dispatcher_(NULL) {}
- virtual ~TestDispatcherClient() {}
+ ~TestDispatcherClient() override {}
base::MessagePumpDispatcher* dispatcher() {
return dispatcher_;
}
// aura::client::DispatcherClient:
- virtual void PrepareNestedLoopClosures(
- base::MessagePumpDispatcher* dispatcher,
- base::Closure* run_closure,
- base::Closure* quit_closure) override {
+ void PrepareNestedLoopClosures(base::MessagePumpDispatcher* dispatcher,
+ base::Closure* run_closure,
+ base::Closure* quit_closure) override {
scoped_ptr<base::RunLoop> run_loop(new base::RunLoop());
*quit_closure = run_loop->QuitClosure();
*run_closure = base::Bind(&TestDispatcherClient::RunNestedDispatcher,
@@ -111,9 +110,7 @@ class TestDispatcherClient : public aura::client::DispatcherClient {
class MenuControllerTest : public ViewsTestBase {
public:
MenuControllerTest() : controller_(NULL) {}
- virtual ~MenuControllerTest() {
- ResetMenuController();
- }
+ ~MenuControllerTest() override { ResetMenuController(); }
// Dispatches |count| number of items, each in a separate iteration of the
// message-loop, by posting a task.
« no previous file with comments | « ui/views/controls/menu/menu_controller.h ('k') | ui/views/controls/menu/menu_event_dispatcher_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698