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

Unified Diff: ash/wm/window_modality_controller_unittest.cc

Issue 11568006: events: Update scroll and touch handlers to not return EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: self-nit Created 8 years 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 | « ash/wm/user_activity_detector_unittest.cc ('k') | ash/wm/workspace/workspace_cycler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 94a647c9cff4a20d080884d429a986d53cf4ffca..65927afa9c1920d8795e104e6848b7fb823d10ea 100644
--- a/ash/wm/window_modality_controller_unittest.cc
+++ b/ash/wm/window_modality_controller_unittest.cc
@@ -298,9 +298,9 @@ class TouchTrackerWindowDelegate : public aura::test::TestWindowDelegate {
private:
// Overridden from aura::test::TestWindowDelegate.
- virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
+ virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
received_touch_ = true;
- return aura::test::TestWindowDelegate::OnTouchEvent(event);
+ aura::test::TestWindowDelegate::OnTouchEvent(event);
}
bool received_touch_;
« no previous file with comments | « ash/wm/user_activity_detector_unittest.cc ('k') | ash/wm/workspace/workspace_cycler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698