events: Update scroll and touch handlers to not return EventResult.

chrome/browser/ui/views/ash/tab_scrubber.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/views/ash/tab_scrubber.h"
 
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ skipping 32 matching lines @@
     : scrubbing_(false),
       browser_(NULL),
       scroll_x_(-1),
       scroll_y_(-1) {
   ash::Shell::GetInstance()->AddPreTargetHandler(this);
 }
 
 TabScrubber::~TabScrubber() {
 }
 
-ui::EventResult TabScrubber::OnScrollEvent(ui::ScrollEvent* event) {
+void TabScrubber::OnScrollEvent(ui::ScrollEvent* event) {
   if (event->type() == ui::ET_SCROLL_FLING_CANCEL) {
     if (scrubbing_)
       StopScrubbing();
-    return ui::ER_UNHANDLED;
+    return;
   }
 
   if (event->finger_count() != 3 ||
       event->type() != ui::ET_SCROLL)
-    return ui::ER_UNHANDLED;
+    return;
 
   Browser* browser = GetActiveBrowser();
   if (!browser || (browser_ && browser != browser_)) {
     if (scrubbing_)
       StopScrubbing();
-    return ui::ER_UNHANDLED;
+    return;
   }
 
   BrowserView* browser_view =
       BrowserView::GetBrowserViewForNativeWindow(
           browser->window()->GetNativeWindow());
   TabStrip* tab_strip = browser_view->tabstrip();
 
   float x_offset = -event->x_offset();
   if (!scrubbing_) {
     scrubbing_ = true;
@@ skipping 20 matching lines @@
   if (scroll_x_ > last_tab->bounds().right())
     scroll_x_ = last_tab->bounds().right();
 
   gfx::Point tab_point(scroll_x_, scroll_y_);
   Tab* new_tab = GetTabAt(tab_strip, tab_point);
   if (new_tab && !new_tab->IsActive()) {
     int new_index = tab_strip->GetModelIndexOfTab(new_tab);
     browser->tab_strip_model()->ActivateTabAt(new_index, true);
   }
 
-  return ui::ER_CONSUMED;
+  event->StopPropagation();
 }
 
 void TabScrubber::Observe(int type,
                           const content::NotificationSource& source,
                           const content::NotificationDetails& details) {
   DCHECK(type == chrome::NOTIFICATION_BROWSER_CLOSING &&
          content::Source<Browser>(source).ptr() == browser_);
   StopScrubbing();
 }
 
@@ skipping 13 matching lines @@
   if (!scrubbing_)
     return;
 
   registrar_.Remove(
       this,
       chrome::NOTIFICATION_BROWSER_CLOSING,
       content::Source<Browser>(browser_));
   scrubbing_ = false;
   browser_ = NULL;
 }