summaryrefslogtreecommitdiffstats
path: root/ash/shell.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ash/shell.cc')
-rw-r--r--ash/shell.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/ash/shell.cc b/ash/shell.cc
index a9f9d42..7eac672 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -66,6 +66,7 @@
#include "base/command_line.h"
#include "grit/ui_resources.h"
#include "ui/aura/client/aura_constants.h"
+#include "ui/aura/client/user_action_client.h"
#include "ui/aura/env.h"
#include "ui/aura/focus_manager.h"
#include "ui/aura/layout_manager.h"
@@ -753,6 +754,11 @@ void Shell::Init() {
if (!user_wallpaper_delegate_.get())
user_wallpaper_delegate_.reset(new DummyUserWallpaperDelegate());
+ if (delegate_.get())
+ user_action_client_.reset(delegate_->CreateUserActionClient());
+ if (user_action_client_.get())
+ aura::client::SetUserActionClient(root_window, user_action_client_.get());
+
InitLayoutManagers();
if (!command_line->HasSwitch(switches::kAuraNoShadows)) {