diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-06 20:35:25 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-06 20:35:25 +0000 |
| commit | 06b1d42b0ceadd4a70b7462c5c7e6adeb5a18ca4 (patch) | |
| tree | 668fa900e2851fa2eca43b2e5a087dde2f17b9d7 /ash/shell.cc | |
| parent | ca40ae55cf880d8abf4e8e9c1983d61174fe1432 (diff) | |
| download | chromium_src-06b1d42b0ceadd4a70b7462c5c7e6adeb5a18ca4.zip chromium_src-06b1d42b0ceadd4a70b7462c5c7e6adeb5a18ca4.tar.gz chromium_src-06b1d42b0ceadd4a70b7462c5c7e6adeb5a18ca4.tar.bz2 | |
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
Previously landed in r255385, reverted in r255398 to allow another revert in r255399.
Review URL: https://codereview.chromium.org/183853037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255416 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 2b6a8c9..4f0b8cb 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -85,7 +85,6 @@ #include "base/command_line.h" #include "base/debug/trace_event.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/client/user_action_client.h" #include "ui/aura/env.h" #include "ui/aura/layout_manager.h" #include "ui/aura/window.h" @@ -724,7 +723,6 @@ Shell::~Shell() { event_client_.reset(); nested_dispatcher_controller_.reset(); toplevel_window_event_handler_.reset(); - user_action_client_.reset(); visibility_controller_.reset(); // |shelf_item_delegate_manager_| observes |shelf_model_|. It must be // destroyed before |shelf_model_| is destroyed. @@ -919,7 +917,6 @@ void Shell::Init() { // TODO(oshima): Move as many controllers before creating // RootWindowController as possible. visibility_controller_.reset(new AshVisibilityController); - user_action_client_.reset(delegate_->CreateUserActionClient()); magnification_controller_.reset( MagnificationController::CreateInstance()); @@ -1071,8 +1068,6 @@ void Shell::InitRootWindow(aura::Window* root_window) { aura::client::SetDispatcherClient(root_window, nested_dispatcher_controller_.get()); } - if (user_action_client_) - aura::client::SetUserActionClient(root_window, user_action_client_.get()); } bool Shell::CanWindowReceiveEvents(aura::Window* window) { |