Move gesture recognition from WindowManagerApp to Sky

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"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
 #include "mojo/services/view_manager/public/cpp/view.h"
 #include "mojo/services/view_manager/public/cpp/view_manager.h"
 #include "services/window_manager/capture_controller.h"
 #include "services/window_manager/focus_controller.h"
 #include "services/window_manager/focus_rules.h"
 #include "services/window_manager/hit_test.h"
 #include "services/window_manager/view_event_dispatcher.h"
 #include "services/window_manager/view_target.h"
 #include "services/window_manager/view_targeter.h"
 #include "services/window_manager/window_manager_delegate.h"
-#include "ui/events/gestures/gesture_recognizer.h"
 
 using mojo::ApplicationConnection;
 using mojo::Id;
 using mojo::ServiceProvider;
 using mojo::View;
 using mojo::WindowManager;
 
 namespace window_manager {
 
 namespace {
@@ skipping 33 matching lines @@
     View* view = cached_view_manager->GetViewById(*it);
     if (view && view == root_)
       root_ = nullptr;
     if (view)
       view->RemoveObserver(this);
   }
   registered_view_id_set_.clear();
   DCHECK(!root_);
 
   STLDeleteElements(&connections_);
-  ui::GestureRecognizer::Get()->CleanupStateForConsumer(this);
 }
 
 void WindowManagerApp::AddConnection(WindowManagerImpl* connection) {
   DCHECK(connections_.find(connection) == connections_.end());
   connections_.insert(connection);
 }
 
 void WindowManagerApp::RemoveConnection(WindowManagerImpl* connection) {
   DCHECK(connections_.find(connection) != connections_.end());
   connections_.erase(connection);
@@ skipping 141 matching lines @@
   if (!window_manager_client_)
     return;
 
   View* view = static_cast<ViewTarget*>(event->target())->view();
   if (!view)
     return;
 
   if (focus_controller_)
     focus_controller_->OnEvent(event);
 
-  auto gesture_recognizer = ui::GestureRecognizer::Get();
-  ui::TouchEvent* touch_event =
-      event->IsTouchEvent() ? static_cast<ui::TouchEvent*>(event) : nullptr;
-
-  if (touch_event)
-    gesture_recognizer->ProcessTouchEventPreDispatch(*touch_event, this);
-
   window_manager_client_->DispatchInputEventToView(view->id(),
                                                    mojo::Event::From(*event));
-
-  if (touch_event) {
-    scoped_ptr<ScopedVector<ui::GestureEvent>> gestures(
-        gesture_recognizer->ProcessTouchEventPostDispatch(
-            *touch_event, ui::ER_UNHANDLED, this));
-
-    if (gestures) {
-      for (auto& gesture : *gestures) {
-        window_manager_client_->DispatchInputEventToView(
-            view->id(), mojo::Event::From(*gesture));
-      }
-    }
-  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, mojo::FocusControllerObserver implementation:
 
 void WindowManagerApp::OnFocused(View* gained_focus) {
   for (Connections::const_iterator it = connections_.begin();
        it != connections_.end(); ++it) {
     (*it)->NotifyViewFocused(GetIdForView(gained_focus));
   }
@@ skipping 115 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