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.h | |
| 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.h')
| -rw-r--r-- | ash/shell.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ash/shell.h b/ash/shell.h index 374015d..9e48aa2 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -37,6 +37,7 @@ namespace ash { class AcceleratorController; class Launcher; +class NestedDispatcherController; class PowerButtonController; class ShellDelegate; class VideoDetector; @@ -183,6 +184,8 @@ class ASH_EXPORT Shell { base::WeakPtrFactory<Shell> method_factory_; + scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_; + scoped_ptr<AcceleratorController> accelerator_controller_; scoped_ptr<ShellDelegate> delegate_; |