Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(183)

Unified Diff: ash/shell.h

Issue 307533007: Move common accelerator code from ash to ui/wm/core (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/ash.gyp ('k') | ash/shell.cc » ('j') | ui/wm/core/accelerator_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index fcc3736319d2e105d8d0dc6d77489edbf6dcd093..1518ea620045d03c1b83137d95f6db657d005ae0 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_;
« no previous file with comments | « ash/ash.gyp ('k') | ash/shell.cc » ('j') | ui/wm/core/accelerator_delegate.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698