Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(737)

Unified Diff: trunk/src/chrome/browser/ui/ash/chrome_shell_delegate.cc

Issue 186123004: Revert 255385 "aura: Remove client::UserActionClient." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/browser/ui/ash/chrome_shell_delegate.cc
===================================================================
--- trunk/src/chrome/browser/ui/ash/chrome_shell_delegate.cc (revision 255397)
+++ trunk/src/chrome/browser/ui/ash/chrome_shell_delegate.cc (working copy)
@@ -21,6 +21,7 @@
#include "chrome/browser/ui/ash/ash_keyboard_controller_proxy.h"
#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
#include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
+#include "chrome/browser/ui/ash/user_action_handler.h"
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/common/chrome_switches.h"
#include "grit/chromium_strings.h"
@@ -124,6 +125,10 @@
return shelf_delegate_;
}
+aura::client::UserActionClient* ChromeShellDelegate::CreateUserActionClient() {
+ return new UserActionHandler;
+}
+
ui::MenuModel* ChromeShellDelegate::CreateContextMenu(
aura::Window* root,
ash::ShelfItemDelegate* item_delegate,
« no previous file with comments | « trunk/src/chrome/browser/ui/ash/chrome_shell_delegate.h ('k') | trunk/src/chrome/browser/ui/ash/user_action_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698