| Index: ui/events/x/device_data_manager_x11_unittest.cc
|
| diff --git a/ui/events/x/device_data_manager_x11_unittest.cc b/ui/events/x/device_data_manager_x11_unittest.cc
|
| index 08254ea91fd2b12189ffe6f19a69ec7fb8cb950b..3376d5b875850a211b5b7b5ea8dd62035e4b13ae 100644
|
| --- a/ui/events/x/device_data_manager_x11_unittest.cc
|
| +++ b/ui/events/x/device_data_manager_x11_unittest.cc
|
| @@ -29,14 +29,14 @@ class TestInputDeviceObserver : public InputDeviceEventObserver {
|
| manager_->AddObserver(this);
|
| }
|
|
|
| - virtual ~TestInputDeviceObserver() {
|
| + ~TestInputDeviceObserver() override {
|
| if (manager_)
|
| manager_->RemoveObserver(this);
|
| }
|
|
|
| // InputDeviceEventObserver implementation.
|
| - virtual void OnTouchscreenDeviceConfigurationChanged() override {}
|
| - virtual void OnKeyboardDeviceConfigurationChanged() override {
|
| + void OnTouchscreenDeviceConfigurationChanged() override {}
|
| + void OnKeyboardDeviceConfigurationChanged() override {
|
| change_notified_ = true;
|
| }
|
|
|
| @@ -55,11 +55,11 @@ class TestInputDeviceObserver : public InputDeviceEventObserver {
|
| class DeviceDataManagerX11Test : public testing::Test {
|
| public:
|
| DeviceDataManagerX11Test() {}
|
| - virtual ~DeviceDataManagerX11Test() {}
|
| + ~DeviceDataManagerX11Test() override {}
|
|
|
| - virtual void SetUp() override { DeviceDataManagerX11::CreateInstance(); }
|
| + void SetUp() override { DeviceDataManagerX11::CreateInstance(); }
|
|
|
| - virtual void TearDown() override {
|
| + void TearDown() override {
|
| SetKeyboardDevices(std::vector<KeyboardDevice>());
|
| }
|
|
|
|
|