| 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 dad98cba6faaf8373286dfa1629a22fdcd8f7b5b..14642daf7f56d4d20bf06c6287863186867f16e0 100644
|
| --- a/ash/host/ash_window_tree_host_x11_unittest.cc
|
| +++ b/ash/host/ash_window_tree_host_x11_unittest.cc
|
| @@ -32,7 +32,7 @@ class RootWindowEventHandler : public ui::EventHandler {
|
| virtual ~RootWindowEventHandler() { target_->RemovePreTargetHandler(this); }
|
|
|
| // ui::EventHandler:
|
| - virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
|
| + virtual 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 {
|
| + virtual 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 {
|
| + virtual void TearDown() override {
|
| aura::test::AuraTestBase::TearDown();
|
|
|
| #if defined(OS_CHROMEOS)
|
|
|