touch: Return an enum from OnTouchEvent.

views/view_unittest.cc

 // Copyright (c) 2010 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 <map>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/path.h"
@@ skipping 136 matching lines @@
     accelerator_count_map_.clear();
   }
 
   virtual void DidChangeBounds(const gfx::Rect& previous,
                                const gfx::Rect& current);
   virtual void ViewHierarchyChanged(bool is_add, View *parent, View *child);
   virtual bool OnMousePressed(const MouseEvent& event);
   virtual bool OnMouseDragged(const MouseEvent& event);
   virtual void OnMouseReleased(const MouseEvent& event, bool canceled);
 #if defined(TOUCH_UI)
-  virtual bool OnTouchEvent(const TouchEvent& event);
+  virtual TouchStatus OnTouchEvent(const TouchEvent& event);
 #endif
   virtual void Paint(gfx::Canvas* canvas);
   virtual bool AcceleratorPressed(const Accelerator& accelerator);
 
   // DidChangeBounds test
   bool did_change_bounds_;
   gfx::Rect previous_bounds_;
   gfx::Rect new_bounds_;
 
   // AddRemoveNotifications test
@@ skipping 254 matching lines @@
   last_touch_event_ =  event.GetType();
   last_view_ = source;
   previously_handled_flag_ = previouslyHandled;
   dispatched_synthetic_event_ = true;
   return true;
 }
 
 MockGestureManager::MockGestureManager() {
 }
 
-bool TestView::OnTouchEvent(const TouchEvent& event) {
+View::TouchStatus TestView::OnTouchEvent(const TouchEvent& event) {
   last_touch_event_type_ = event.GetType();
   location_.SetPoint(event.x(), event.y());
-  return last_touch_event_was_handled_;
+  return last_touch_event_was_handled_ ? TOUCH_STATUS_CONTINUE :
+                                         TOUCH_STATUS_UNKNOWN;
 }
 
 TEST_F(ViewTest, TouchEvent) {
   MockGestureManager* gm = new MockGestureManager();
 
   TestView* v1 = new TestView();
   v1->SetBounds(0, 0, 300, 300);
 
   TestView* v2 = new TestView();
   v2->SetBounds(100, 100, 100, 100);
@@ skipping 1021 matching lines @@
 #endif
 }
 
 TEST_F(ViewTest, ChangeNativeViewHierarchyChangeHierarchy) {
   // TODO(georgey): Fix the test for Linux
 #if defined(OS_WIN)
   TestChangeNativeViewHierarchy test(this);
   test.CheckChangingHierarhy();
 #endif
 }