| Index: ash/wm/window_modality_controller_unittest.cc
|
| diff --git a/ash/wm/window_modality_controller_unittest.cc b/ash/wm/window_modality_controller_unittest.cc
|
| index d749bd6e4bbb6bc4ce402fe73c597cf59685cf56..f6f4271d24542bc40d34544fdc11c956ae2021bd 100644
|
| --- a/ash/wm/window_modality_controller_unittest.cc
|
| +++ b/ash/wm/window_modality_controller_unittest.cc
|
| @@ -294,7 +294,7 @@ class TouchTrackerWindowDelegate : public aura::test::TestWindowDelegate {
|
|
|
| private:
|
| // Overridden from aura::test::TestWindowDelegate.
|
| - virtual ui::TouchStatus OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
|
| + virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
|
| received_touch_ = true;
|
| return aura::test::TestWindowDelegate::OnTouchEvent(event);
|
| }
|
|
|