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

Side by Side Diff: ui/chromeos/touch_exploration_controller.h

Issue 428673002: Fix Touch Exploration tests so they don't break eager gesture detection. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix bug??? Created 6 years, 4 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_CHROMEOS_TOUCH_EXPLORATION_CONTROLLER_H_ 5 #ifndef UI_CHROMEOS_TOUCH_EXPLORATION_CONTROLLER_H_
6 #define UI_CHROMEOS_TOUCH_EXPLORATION_CONTROLLER_H_ 6 #define UI_CHROMEOS_TOUCH_EXPLORATION_CONTROLLER_H_
7 7
8 #include "base/timer/timer.h" 8 #include "base/timer/timer.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "ui/chromeos/ui_chromeos_export.h" 10 #include "ui/chromeos/ui_chromeos_export.h"
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 // TWO_TO_ONE_FINGER. When the user lifts a finger during two to one, 354 // TWO_TO_ONE_FINGER. When the user lifts a finger during two to one,
355 // the location and id of the touch release is from here. 355 // the location and id of the touch release is from here.
356 scoped_ptr<ui::TouchEvent> last_two_to_one_; 356 scoped_ptr<ui::TouchEvent> last_two_to_one_;
357 357
358 // A timer to fire the mouse move event after the double-tap delay. 358 // A timer to fire the mouse move event after the double-tap delay.
359 base::OneShotTimer<TouchExplorationController> tap_timer_; 359 base::OneShotTimer<TouchExplorationController> tap_timer_;
360 360
361 // A timer to fire an indicating sound when sliding to change volume. 361 // A timer to fire an indicating sound when sliding to change volume.
362 base::RepeatingTimer<TouchExplorationController> sound_timer_; 362 base::RepeatingTimer<TouchExplorationController> sound_timer_;
363 363
364 // For testing only, an event handler to use for generated events
365 // outside of the normal event rewriting flow.
366 ui::EventHandler* event_handler_for_testing_;
367
368 // A default gesture detector config, so we can share the same 364 // A default gesture detector config, so we can share the same
369 // timeout and pixel slop constants. 365 // timeout and pixel slop constants.
370 ui::GestureDetector::Config gesture_detector_config_; 366 ui::GestureDetector::Config gesture_detector_config_;
371 367
372 // Gesture Handler to interpret the touch events. 368 // Gesture Handler to interpret the touch events.
373 ui::GestureProviderAura gesture_provider_; 369 ui::GestureProviderAura gesture_provider_;
374 370
375 // The previous state entered. 371 // The previous state entered.
376 State prev_state_; 372 State prev_state_;
377 373
378 // A copy of the previous event passed. 374 // A copy of the previous event passed.
379 scoped_ptr<ui::TouchEvent> prev_event_; 375 scoped_ptr<ui::TouchEvent> prev_event_;
380 376
381 // This toggles whether VLOGS are turned on or not. 377 // This toggles whether VLOGS are turned on or not.
382 bool VLOG_on_; 378 bool VLOG_on_;
383 379
384 DISALLOW_COPY_AND_ASSIGN(TouchExplorationController); 380 DISALLOW_COPY_AND_ASSIGN(TouchExplorationController);
385 }; 381 };
386 382
387 } // namespace ui 383 } // namespace ui
388 384
389 #endif // UI_CHROMEOS_TOUCH_EXPLORATION_CONTROLLER_H_ 385 #endif // UI_CHROMEOS_TOUCH_EXPLORATION_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698