| Index: ash/host/ash_window_tree_host_x11_unittest.cc
|
| diff --git a/ash/host/ash_window_tree_host_x11_unittest.cc b/ash/host/ash_window_tree_host_x11_unittest.cc
|
| index 14642daf7f56d4d20bf06c6287863186867f16e0..442cbbf881ddd4bc94a4218ace219e3d20a18437 100644
|
| --- a/ash/host/ash_window_tree_host_x11_unittest.cc
|
| +++ b/ash/host/ash_window_tree_host_x11_unittest.cc
|
| @@ -29,10 +29,10 @@ class RootWindowEventHandler : public ui::EventHandler {
|
| last_touch_location_(0, 0) {
|
| target_->AddPreTargetHandler(this);
|
| }
|
| - virtual ~RootWindowEventHandler() { target_->RemovePreTargetHandler(this); }
|
| + ~RootWindowEventHandler() override { target_->RemovePreTargetHandler(this); }
|
|
|
| // ui::EventHandler:
|
| - virtual void OnTouchEvent(ui::TouchEvent* event) override {
|
| + void OnTouchEvent(ui::TouchEvent* event) override {
|
| last_touch_id_ = event->touch_id();
|
| last_touch_type_ = event->type();
|
| last_touch_location_ = event->location();
|
| @@ -59,7 +59,7 @@ namespace ash {
|
|
|
| class AshWindowTreeHostX11Test : public aura::test::AuraTestBase {
|
| public:
|
| - virtual void SetUp() override {
|
| + void SetUp() override {
|
| aura::test::AuraTestBase::SetUp();
|
|
|
| #if defined(OS_CHROMEOS)
|
| @@ -69,7 +69,7 @@ class AshWindowTreeHostX11Test : public aura::test::AuraTestBase {
|
| #endif
|
| }
|
|
|
| - virtual void TearDown() override {
|
| + void TearDown() override {
|
| aura::test::AuraTestBase::TearDown();
|
|
|
| #if defined(OS_CHROMEOS)
|
|
|