Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(531)

Unified Diff: services/window_manager/window_manager_app.h

Issue 789363004: WindowManagerApp should recognize gestures (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Rename Aura to Impl and add FIXME Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: services/window_manager/window_manager_app.h
diff --git a/services/window_manager/window_manager_app.h b/services/window_manager/window_manager_app.h
index cdd7368bd48efd6a952ddfe176eefd1466e32274..2b49d82cf86e1f3cd4d9031055d570517ed11cd3 100644
--- a/services/window_manager/window_manager_app.h
+++ b/services/window_manager/window_manager_app.h
@@ -24,6 +24,7 @@
#include "services/window_manager/view_target.h"
#include "services/window_manager/window_manager_impl.h"
#include "ui/events/event_handler.h"
+#include "ui/events/gestures/gesture_provider_impl.h"
namespace gfx {
class Size;
@@ -52,6 +53,7 @@ class WindowManagerApp
public mojo::ViewManagerDelegate,
public mojo::ViewObserver,
public ui::EventHandler,
+ public ui::GestureProviderImplClient,
public FocusControllerObserver,
public CaptureControllerObserver,
public mojo::InterfaceFactory<mojo::WindowManager>,
@@ -134,6 +136,9 @@ class WindowManagerApp
// Overridden from ui::EventHandler:
void OnEvent(ui::Event* event) override;
+ // Overridden from ui::GestureProviderImplClient:
+ void OnGestureEvent(ui::GestureEvent* event) override;
+
// Overridden from mojo::FocusControllerObserver:
void OnViewFocused(mojo::View* gained_focus, mojo::View* lost_focus) override;
void OnViewActivated(mojo::View* gained_active,
@@ -172,6 +177,7 @@ class WindowManagerApp
scoped_ptr<mojo::ViewManagerClientFactory> view_manager_client_factory_;
mojo::View* root_;
+ ui::GestureProviderImpl gesture_provider_;
scoped_ptr<FocusController> focus_controller_;
scoped_ptr<CaptureController> capture_controller_;
« no previous file with comments | « mojo/converters/input_events/input_events_type_converters.cc ('k') | services/window_manager/window_manager_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698