diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-06 18:07:58 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-06 18:07:58 +0000 |
commit | 74684ce7d2c75ca285143884419362475f2bfa70 (patch) | |
tree | 4da678b2577074a5cbde1dab3ea6daeba6cfe7bf /ash/shell.h | |
parent | 51cb94c68d8adbfa4736029ac2bcd70d924946e9 (diff) | |
download | chromium_src-74684ce7d2c75ca285143884419362475f2bfa70.zip chromium_src-74684ce7d2c75ca285143884419362475f2bfa70.tar.gz chromium_src-74684ce7d2c75ca285143884419362475f2bfa70.tar.bz2 |
Revert 255385 "aura: Remove client::UserActionClient."
> aura: Remove client::UserActionClient.
>
> UserActionClient is used to navigate back/forward when the back/forward on a
> supported mouse-device is clicked on X11. This can instead be achieved by
> installing an event-handler on the browser window.
>
> This does change the behaviour a little on ChromeOS: clicking these navigation
> buttons when the cursor is not on top of the browser window will not navigate
> after this change. I have confirmed with UX that this is a desirable change.
>
> BUG=319636
> R=sky@chromium.org
>
> Review URL: https://codereview.chromium.org/183853037
TBR=sadrul@chromium.org
Review URL: https://codereview.chromium.org/186123004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255398 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
-rw-r--r-- | ash/shell.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/shell.h b/ash/shell.h index 6bb3be0..bc318f0 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -40,6 +40,7 @@ class Window; namespace client { class ActivationClient; class FocusClient; +class UserActionClient; } } namespace chromeos { @@ -665,6 +666,7 @@ class ASH_EXPORT Shell scoped_ptr<PartialMagnificationController> partial_magnification_controller_; scoped_ptr<AutoclickController> autoclick_controller_; scoped_ptr<aura::client::FocusClient> focus_client_; + scoped_ptr<aura::client::UserActionClient> user_action_client_; aura::client::ActivationClient* activation_client_; scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_; scoped_ptr<internal::ScreenPositionController> screen_position_controller_; |