diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 14:44:53 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 14:44:53 +0000 |
| commit | 8f80db0f2c8b752d0f405f541ce7f9f88a698517 (patch) | |
| tree | c43c65357d18150441a27df3129fbcb118c7a625 /ash/shell.cc | |
| parent | 0ae649994e12ba599ad74a41129e046f941c064e (diff) | |
| download | chromium_src-8f80db0f2c8b752d0f405f541ce7f9f88a698517.zip chromium_src-8f80db0f2c8b752d0f405f541ce7f9f88a698517.tar.gz chromium_src-8f80db0f2c8b752d0f405f541ce7f9f88a698517.tar.bz2 | |
Implements accelerator handling for menus on aura.
BUG=105964
TEST=Manual
Review URL: https://chromiumcodereview.appspot.com/9224001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120777 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index f47938c..5bfd3d4 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -8,6 +8,7 @@ #include "ash/accelerators/accelerator_controller.h" #include "ash/accelerators/accelerator_filter.h" +#include "ash/accelerators/nested_dispatcher_controller.h" #include "ash/app_list/app_list.h" #include "ash/ash_switches.h" #include "ash/drag_drop/drag_drop_controller.h" @@ -205,6 +206,7 @@ Shell* Shell::instance_ = NULL; Shell::Shell(ShellDelegate* delegate) : ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)), + nested_dispatcher_controller_(new NestedDispatcherController), accelerator_controller_(new AcceleratorController), delegate_(delegate), window_mode_(MODE_OVERLAPPING), |