Revert 255385 "aura: Remove client::UserActionClient."

trunk/src/ash/shell.cc

Index: trunk/src/ash/shell.cc
===================================================================
--- trunk/src/ash/shell.cc	(revision 255397)
+++ trunk/src/ash/shell.cc	(working copy)
@@ -85,6 +85,7 @@
 #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"
@@ -723,6 +724,7 @@
   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.
@@ -917,6 +919,7 @@
   // 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());
@@ -1068,6 +1071,8 @@
     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) {