summaryrefslogtreecommitdiffstats
path: root/ash/touch
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-04 16:51:35 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-04 16:51:35 +0000
commit771abe6bdfeee27c1366e56cecb1f01b88b757db (patch)
tree1ba730e6742bbd897ca2bbe4b8e0c1eb9991c647 /ash/touch
parent1df2093adb550a8468b92929d8ec79160ea4045a (diff)
downloadchromium_src-771abe6bdfeee27c1366e56cecb1f01b88b757db.zip
chromium_src-771abe6bdfeee27c1366e56cecb1f01b88b757db.tar.gz
chromium_src-771abe6bdfeee27c1366e56cecb1f01b88b757db.tar.bz2
ash: Remove a CHECK since it's getting hit a lot.
The exact reason for the CHECK being triggered is still unclear, but this is a non-fatal situation, so handle it gracefully. BUG=144257 Review URL: https://chromiumcodereview.appspot.com/10908070 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154764 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/touch')
-rw-r--r--ash/touch/touch_uma.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/ash/touch/touch_uma.cc b/ash/touch/touch_uma.cc
index ed66bb2..e929828 100644
--- a/ash/touch/touch_uma.cc
+++ b/ash/touch/touch_uma.cc
@@ -264,7 +264,11 @@ void TouchUMA::RecordGestureEvent(aura::Window* target,
if (event.type() == ui::ET_GESTURE_END &&
event.details().touch_points() == 2) {
WindowTouchDetails* details = target->GetProperty(kWindowTouchDetails);
- CHECK(details) << "Window received gesture but no touch events?";
+ if (!details) {
+ LOG(ERROR) << "Window received gesture events without receiving any touch"
+ " events";
+ return;
+ }
details->last_mt_time_ = event.time_stamp();
}
}