Fixed NOTREACHED() bug in touch_exploration_controller.

ui/chromeos/touch_exploration_controller.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/chromeos/touch_exploration_controller.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
@@ skipping 225 matching lines @@
 TouchExplorationController::InSingleTapOrTouchExploreReleased(
     const ui::TouchEvent& event,
     scoped_ptr<ui::Event>* rewritten_event) {
   const ui::EventType type = event.type();
   // If there is more than one finger down, then discard to wait until only one
   // finger is or no fingers are down.
   if (current_touch_ids_.size() > 1) {
     state_ = WAIT_FOR_RELEASE;
     return ui::EVENT_REWRITE_DISCARD;
   }
-  // If there is no touch exploration yet, discard.
-  if (!last_touch_exploration_ || type == ui::ET_TOUCH_RELEASED) {
-    if (current_touch_ids_.size() == 0) {
-      ResetToNoFingersDown();
+  if (type == ui::ET_TOUCH_PRESSED) {
+    // If there is no touch exploration yet, we can't send a click, so discard.
+    if (!last_touch_exploration_) {
+      tap_timer_.Stop();
+      return ui::EVENT_REWRITE_DISCARD;
     }
-    return ui::EVENT_REWRITE_DISCARD;
-  }
-
-  if (type == ui::ET_TOUCH_PRESSED) {
     // This is the second tap in a double-tap (or double tap-hold).
     // Rewrite at location of last touch exploration.
     rewritten_event->reset(
         new ui::TouchEvent(ui::ET_TOUCH_PRESSED,
                            last_touch_exploration_->location(),
                            event.touch_id(),
                            event.time_stamp()));
     (*rewritten_event)->set_flags(event.flags());
     state_ = DOUBLE_TAP_PRESSED;
     VLOG_STATE();
@@ skipping 614 matching lines @@
       return "PASSTHROUGH";
     case WAIT_FOR_RELEASE:
       return "WAIT_FOR_RELEASE";
     case SLIDE_GESTURE:
       return "SLIDE_GESTURE";
   }
   return "Not a state";
 }
 
 }  // namespace ui