WindowManagerApp should recognize gestures

services/window_manager/window_manager_app.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 "services/window_manager/window_manager_app.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
@@ skipping 37 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, public:
 
 WindowManagerApp::WindowManagerApp(
     ViewManagerDelegate* view_manager_delegate,
     WindowManagerDelegate* window_manager_delegate)
     : shell_(nullptr),
       native_viewport_event_dispatcher_factory_(this),
       wrapped_view_manager_delegate_(view_manager_delegate),
       window_manager_delegate_(window_manager_delegate),
-      root_(nullptr) {
+      root_(nullptr),
+      gesture_provider_(this) {
 }
 
 WindowManagerApp::~WindowManagerApp() {
   STLDeleteElements(&connections_);
 }
 
 void WindowManagerApp::AddConnection(WindowManagerImpl* connection) {
   DCHECK(connections_.find(connection) == connections_.end());
   connections_.insert(connection);
 }
@@ skipping 143 matching lines @@
 
   View* view = static_cast<ViewTarget*>(event->target())->view();
   if (!view)
     return;
 
   if (focus_controller_)
     focus_controller_->OnEvent(event);
 
   window_manager_client_->DispatchInputEventToView(view->id(),
                                                    mojo::Event::From(*event));
+
+  if (event->IsTouchEvent()) {
+    gesture_provider_.OnTouchEvent(*static_cast<ui::TouchEvent*>(event));
+    scoped_ptr<ScopedVector<ui::GestureEvent>> gestures(
+        gesture_provider_.GetAndResetPendingGestures());
+    if (gestures) {
+      for (auto& gesture : *gestures) {
+        window_manager_client_->DispatchInputEventToView(
+            view->id(), mojo::Event::From(*gesture));
+      }
+    }
+    gesture_provider_.OnTouchEventAck(false);
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// WindowManagerApp, ui::GestureProviderImplClient implementation:
+
+void WindowManagerApp::OnGestureEvent(ui::GestureEvent* event) {
+  DCHECK(!event->IsTouchEvent());
+  // TODO(abarth): Do we need to dispatch this |event|?
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, mojo::FocusControllerObserver implementation:
 
 void WindowManagerApp::OnViewFocused(View* gained_focus,
                                      View* lost_focus) {
   for (Connections::const_iterator it = connections_.begin();
        it != connections_.end(); ++it) {
     (*it)->NotifyViewFocused(GetIdForView(gained_focus),
                              GetIdForView(lost_focus));
   }
 }
@@ skipping 118 matching lines @@
     uint16_t connection_id,
     mojo::ScopedMessagePipeHandle window_manager_pipe) {
   // TODO(sky): pass in |connection_id| for validation.
   WindowManagerImpl* wm = new WindowManagerImpl(this, true);
   wm->Bind(window_manager_pipe.Pass());
   // WindowManagerImpl is deleted when the connection has an error, or from our
   // destructor.
 }
 
 }  // namespace window_manager