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 | |
| 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')
| -rw-r--r-- | ash/shell/shell_delegate_impl.cc | 4 | ||||
| -rw-r--r-- | ash/shell/shell_delegate_impl.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc index a715efa..3abcdab 100644 --- a/ash/shell/shell_delegate_impl.cc +++ b/ash/shell/shell_delegate_impl.cc @@ -155,6 +155,10 @@ ash::MediaDelegate* ShellDelegateImpl::CreateMediaDelegate() { return new MediaDelegateImpl; } +aura::client::UserActionClient* ShellDelegateImpl::CreateUserActionClient() { + return NULL; +} + ui::MenuModel* ShellDelegateImpl::CreateContextMenu( aura::Window* root, ash::ShelfItemDelegate* item_delegate, diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h index 2a095dd..6edcbf0 100644 --- a/ash/shell/shell_delegate_impl.h +++ b/ash/shell/shell_delegate_impl.h @@ -53,6 +53,7 @@ class ShellDelegateImpl : public ash::ShellDelegate { virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE; virtual ash::NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE; virtual ash::MediaDelegate* CreateMediaDelegate() OVERRIDE; + virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE; virtual ui::MenuModel* CreateContextMenu( aura::Window* root_window, ash::ShelfItemDelegate* item_delegate, |