diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-30 13:07:02 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-30 13:07:02 +0000 |
| commit | 60d677dd4521ddde2d8b4e16eee0020e38a21a2f (patch) | |
| tree | b7ce93d078e3bb15052fc04fd0c966dceb247e10 /ash/shell.h | |
| parent | 85e57d4d0241a31881536262ead36f0aff90b4fc (diff) | |
| download | chromium_src-60d677dd4521ddde2d8b4e16eee0020e38a21a2f.zip chromium_src-60d677dd4521ddde2d8b4e16eee0020e38a21a2f.tar.gz chromium_src-60d677dd4521ddde2d8b4e16eee0020e38a21a2f.tar.bz2 | |
Move common accelerator code from ash to ui/wm/core
accelerator_filter_unittest stays in ash because it requires ash.
BUG=375534
Review URL: https://codereview.chromium.org/307533007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273811 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
| -rw-r--r-- | ash/shell.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/shell.h b/ash/shell.h index fcc37363..1518ea6 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -62,6 +62,7 @@ class TooltipController; } namespace wm { +class AcceleratorFilter; class CompoundEventFilter; class InputMethodEventFilter; class NestedAcceleratorController; @@ -75,7 +76,6 @@ namespace ash { class AcceleratorController; class AccelerometerController; -class AcceleratorFilter; class AccessibilityDelegate; class AppListController; class AshNativeCursorManager; @@ -693,7 +693,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate, scoped_ptr<SystemGestureEventFilter> system_gesture_filter_; // An event filter that pre-handles global accelerators. - scoped_ptr<AcceleratorFilter> accelerator_filter_; + scoped_ptr< ::wm::AcceleratorFilter> accelerator_filter_; // An event filter that pre-handles all key events to send them to an IME. scoped_ptr< ::wm::InputMethodEventFilter> input_method_filter_; |