events: Get rid of GestureStatus in favour of EventResult.

ash/system/web_notification/web_notification_tray.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 "ash/system/web_notification/web_notification_tray.h"
 
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/tray_bubble_view.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_views.h"
@@ skipping 474 matching lines @@
   // views::View overrides.
   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE {
     if (event.flags() & ui::EF_RIGHT_MOUSE_BUTTON) {
       ShowMenu(event.location());
       return true;
     }
     tray_->OnClicked(notification_.id);
     return true;
   }
 
-  virtual ui::GestureStatus OnGestureEvent(
+  virtual ui::EventResult OnGestureEvent(
       const ui::GestureEvent& event) OVERRIDE {
     if (event.type() == ui::ET_GESTURE_TAP) {
       tray_->OnClicked(notification_.id);
-      return ui::GESTURE_STATUS_CONSUMED;
+      return ui::ER_CONSUMED;
     }
 
     if (event.type() == ui::ET_GESTURE_LONG_PRESS) {
       ShowMenu(event.location());
-      return ui::GESTURE_STATUS_CONSUMED;
+      return ui::ER_CONSUMED;
     }
 
     if (event.type() == ui::ET_SCROLL_FLING_START) {
       // The threshold for the fling velocity is computed empirically.
       // The unit is in pixels/second.
       const float kFlingThresholdForClose = 800.f;
       if (fabsf(event.details().velocity_x()) > kFlingThresholdForClose) {
         SlideOutAndClose(event.details().velocity_x() < 0 ? SLIDE_LEFT :
                                                             SLIDE_RIGHT);
       } else if (scroller_) {
         RestoreVisualState();
         scroller_->OnGestureEvent(event);
       }
-      return ui::GESTURE_STATUS_CONSUMED;
+      return ui::ER_CONSUMED;
     }
 
     if (!event.IsScrollGestureEvent())
-      return ui::GESTURE_STATUS_UNKNOWN;
+      return ui::ER_UNHANDLED;
 
     if (event.type() == ui::ET_GESTURE_SCROLL_BEGIN) {
       gesture_scroll_amount_ = 0.f;
     } else if (event.type() == ui::ET_GESTURE_SCROLL_UPDATE) {
       // The scroll-update events include the incremental scroll amount.
       gesture_scroll_amount_ += event.details().scroll_x();
 
       ui::Transform transform;
       transform.SetTranslateX(gesture_scroll_amount_);
       layer()->SetTransform(transform);
       layer()->SetOpacity(
           1.f - std::min(fabsf(gesture_scroll_amount_) / width(), 1.f));
 
     } else if (event.type() == ui::ET_GESTURE_SCROLL_END) {
       const float kScrollRatioForClosingNotification = 0.5f;
       float scrolled_ratio = fabsf(gesture_scroll_amount_) / width();
       if (scrolled_ratio >= kScrollRatioForClosingNotification)
         SlideOutAndClose(gesture_scroll_amount_ < 0 ? SLIDE_LEFT : SLIDE_RIGHT);
       else
         RestoreVisualState();
     }
 
     if (scroller_)
       scroller_->OnGestureEvent(event);
-    return ui::GESTURE_STATUS_CONSUMED;
+    return ui::ER_CONSUMED;
   }
 
   // Overridden from ButtonListener.
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE {
     if (sender == close_button_)
       tray_->SendRemoveNotification(notification_.id);
   }
 
   // Overridden from ImplicitAnimationObserver.
@@ skipping 839 matching lines @@
   return message_center_bubble()->MessageViewsForTest();
 }
 
 size_t WebNotificationTray::GetPopupNotificationCountForTest() const {
   if (!popup_bubble())
     return 0;
   return popup_bubble()->MessageViewsForTest();
 }
 
 }  // namespace ash