From c288536191009fe8080396ff292b52aa6f435cdc Mon Sep 17 00:00:00 2001
From: "oshima@chromium.org"
 <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 31 May 2012 22:43:44 +0000
Subject: Move UserGestureHandler to shell Rename class names to UserActionXX
 to avoid confusion with touch gesture and this also handles non gesture mouse
 button action. This is necessary step to allow multiple root windows.

BUG=123160
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10448093

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139899 0039d316-1c4b-4281-b951-d872f2087c98
---
 ash/shell.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'ash/shell.h')

diff --git a/ash/shell.h b/ash/shell.h
index 237c4945..153cd44 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -28,6 +28,9 @@ class FocusManager;
 class Monitor;
 class RootWindow;
 class Window;
+namespace client {
+class UserActionClient;
+}
 namespace shared {
 class InputMethodEventFilter;
 class RootWindowEventFilter;
@@ -381,6 +384,7 @@ class ASH_EXPORT Shell {
   scoped_ptr<internal::MagnificationController> magnification_controller_;
   scoped_ptr<internal::ScreenDimmer> screen_dimmer_;
   scoped_ptr<aura::FocusManager> focus_manager_;
+  scoped_ptr<aura::client::UserActionClient> user_action_client_;
 
   // An event filter that rewrites or drops a key event.
   scoped_ptr<internal::KeyRewriterEventFilter> key_rewriter_filter_;
-- 
cgit v1.1