events: Get rid of GestureStatus in favour of EventResult.

ui/aura/root_window.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 "ui/aura/root_window.h"
 
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 284 matching lines @@
   Window* target = client::GetCaptureWindow(this);
   if (!target) {
     target = ConsumerToWindow(
         gesture_recognizer_->GetTargetForGestureEvent(event));
     if (!target)
       return false;
   }
 
   if (target) {
     event->ConvertLocationToTarget(static_cast<Window*>(this), target);
-    ui::GestureStatus status = ProcessGestureEvent(target, event);
-    return status != ui::GESTURE_STATUS_UNKNOWN;
+    ui::EventResult status = ProcessGestureEvent(target, event);
+    return status != ui::ER_UNHANDLED;
   }
 
   return false;
 }
 
 void RootWindow::OnWindowDestroying(Window* window) {
   OnWindowHidden(window, true);
 
   if (window->IsVisible() &&
       window->ContainsPointInRoot(GetLastMouseLocationInRoot())) {
@@ skipping 348 matching lines @@
 
   if (tracker.Contains(target) && target->delegate()) {
     ui::TouchStatus status = target->delegate()->OnTouchEvent(event);
     if (status != ui::TOUCH_STATUS_UNKNOWN)
       return status;
   }
 
   return ui::TOUCH_STATUS_UNKNOWN;
 }
 
-ui::GestureStatus RootWindow::ProcessGestureEvent(Window* target,
-                                                  ui::GestureEvent* event) {
+ui::EventResult RootWindow::ProcessGestureEvent(Window* target,
+                                                ui::GestureEvent* event) {
   if (!target)
     target = this;
   AutoReset<Window*> reset(&event_dispatch_target_, target);
-  if (ProcessEvent(target, event) != ui::ER_UNHANDLED)
-    return ui::GESTURE_STATUS_CONSUMED;
-  return ui::GESTURE_STATUS_UNKNOWN;
+  return static_cast<ui::EventResult>(ProcessEvent(target, event));
 }
 
 bool RootWindow::ProcessGestures(ui::GestureRecognizer::Gestures* gestures) {
   if (!gestures)
     return false;
   bool handled = false;
   for (unsigned int i = 0; i < gestures->size(); i++) {
     ui::GestureEvent* gesture = gestures->get().at(i);
-    if (DispatchGestureEvent(gesture) != ui::GESTURE_STATUS_UNKNOWN)
+    if (DispatchGestureEvent(gesture) != ui::ER_UNHANDLED)
       handled = true;
   }
   return handled;
 }
 
 void RootWindow::OnWindowRemovedFromRootWindow(Window* detached) {
   DCHECK(aura::client::GetCaptureWindow(this) != this);
 
   OnWindowHidden(detached, false);
 
@@ skipping 364 matching lines @@
 void RootWindow::UnlockCompositor() {
   DCHECK(compositor_lock_);
   compositor_lock_ = NULL;
   if (draw_on_compositor_unlock_) {
     draw_on_compositor_unlock_ = false;
     ScheduleDraw();
   }
 }
 
 }  // namespace aura