diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-06 15:29:50 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-06 15:29:50 +0000 |
| commit | eaef2a3f543f50bdd913d0a3fbe45f270639b9cf (patch) | |
| tree | cef812ee43113dc874aaaf0e1d24074da9c6649e /ash/shell.h | |
| parent | 0f5c8c8def9e8d1af6e76dee819df4be8d30f4e6 (diff) | |
| download | chromium_src-eaef2a3f543f50bdd913d0a3fbe45f270639b9cf.zip chromium_src-eaef2a3f543f50bdd913d0a3fbe45f270639b9cf.tar.gz chromium_src-eaef2a3f543f50bdd913d0a3fbe45f270639b9cf.tar.bz2 | |
Revert 120566 - Implements accelerator handling for menus on aura.
BUG=105964
TEST=Manual
Depends on http://codereview.chromium.org/9124021
Review URL: https://chromiumcodereview.appspot.com/9224001
TBR=pkotwicz@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9310124
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120569 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
| -rw-r--r-- | ash/shell.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ash/shell.h b/ash/shell.h index 9f20fc4..16add64 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -37,7 +37,6 @@ namespace ash { class AcceleratorController; class Launcher; -class NestedDispatcherController; class PowerButtonController; class ShellDelegate; class VideoDetector; @@ -172,8 +171,6 @@ class ASH_EXPORT Shell { base::WeakPtrFactory<Shell> method_factory_; - scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_; - scoped_ptr<AcceleratorController> accelerator_controller_; scoped_ptr<ShellDelegate> delegate_; |