7 files changed, 0 insertions, 23 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) {
diff --git a/ash/shell.h b/ash/shell.h
index bc318f0..6bb3be0 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -40,7 +40,6 @@ class Window;
 namespace client {
 class ActivationClient;
 class FocusClient;
-class UserActionClient;
 }
 }
 namespace chromeos {
@@ -666,7 +665,6 @@ 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_;
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
index 3abcdab..a715efa 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/ash/shell/shell_delegate_impl.cc
@@ -155,10 +155,6 @@ 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 6edcbf0..2a095dd 100644
--- a/ash/shell/shell_delegate_impl.h
+++ b/ash/shell/shell_delegate_impl.h
@@ -53,7 +53,6 @@ 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,
diff --git a/ash/shell_delegate.h b/ash/shell_delegate.h
index 7bb4ebe..7f27d21 100644
--- a/ash/shell_delegate.h
+++ b/ash/shell_delegate.h
@@ -19,9 +19,6 @@ class AppListViewDelegate;
 namespace aura {
 class RootWindow;
 class Window;
-namespace client {
-class UserActionClient;
-}
 }
 
 namespace content {
@@ -123,9 +120,6 @@ class ASH_EXPORT ShellDelegate {
   // Creates a media delegate. Shell takes ownership of the delegate.
   virtual MediaDelegate* CreateMediaDelegate() = 0;
 
-  // Creates a user action client. Shell takes ownership of the object.
-  virtual aura::client::UserActionClient* CreateUserActionClient() = 0;
-
   // Creates a menu model of the context for the |root_window|.
   // When a ContextMenu is used for an item created by ShelfWindowWatcher,
   // passes its ShelfItemDelegate and ShelfItem.
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index 70e2117..72927cc 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -136,10 +136,6 @@ MediaDelegate* TestShellDelegate::CreateMediaDelegate() {
   return new MediaDelegateImpl;
 }
 
-aura::client::UserActionClient* TestShellDelegate::CreateUserActionClient() {
-  return NULL;
-}
-
 ui::MenuModel* TestShellDelegate::CreateContextMenu(
     aura::Window* root,
     ash::ShelfItemDelegate* item_delegate,
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index fa23b48..6090eca 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -49,7 +49,6 @@ class TestShellDelegate : public ShellDelegate {
   virtual AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE;
   virtual NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE;
   virtual MediaDelegate* CreateMediaDelegate() OVERRIDE;
-  virtual aura::client::UserActionClient* CreateUserActionClient() OVERRIDE;
   virtual ui::MenuModel* CreateContextMenu(
       aura::Window* root,
       ash::ShelfItemDelegate* item_delegate,