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

Unified Diff: ui/chromeos/touch_exploration_controller.cc

Issue 2100453002: Remove unnecessary mocking of TickClock for events (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@614409-confirm-timestamp-timebase
Patch Set: Fix touch_unittests Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/chromeos/touch_exploration_controller.h ('k') | ui/chromeos/touch_exploration_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/chromeos/touch_exploration_controller.cc
diff --git a/ui/chromeos/touch_exploration_controller.cc b/ui/chromeos/touch_exploration_controller.cc
index a40f7cb444a5c796e0c7096fe1ce261d796abd08..6a7543d41edf6dde30c9359f533a44743adfe51f 100644
--- a/ui/chromeos/touch_exploration_controller.cc
+++ b/ui/chromeos/touch_exploration_controller.cc
@@ -8,7 +8,6 @@
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
-#include "base/time/default_tick_clock.h"
#include "ui/accessibility/ax_enums.h"
#include "ui/aura/client/cursor_client.h"
#include "ui/aura/window.h"
@@ -40,8 +39,7 @@ TouchExplorationController::TouchExplorationController(
anchor_point_state_(ANCHOR_POINT_NONE),
gesture_provider_(new GestureProviderAura(this, this)),
prev_state_(NO_FINGERS_DOWN),
- VLOG_on_(true),
- tick_clock_(NULL) {
+ VLOG_on_(true) {
DCHECK(root_window);
root_window->GetHost()->GetEventSource()->AddEventRewriter(this);
}
@@ -693,11 +691,6 @@ ui::EventRewriteStatus TouchExplorationController::InTwoFingerTap(
}
base::TimeTicks TouchExplorationController::Now() {
- if (tick_clock_) {
- // This is the same as what EventTimeForNow() does, but here we do it
- // with a clock that can be replaced with a simulated clock for tests.
- return tick_clock_->NowTicks();
- }
return ui::EventTimeForNow();
}
« no previous file with comments | « ui/chromeos/touch_exploration_controller.h ('k') | ui/chromeos/touch_exploration_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698