| 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,
|
|
|