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

Unified Diff: ash/shell.h

Issue 10825026: Make accelerators not to work when the keyboard overlay is shown. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments Created 8 years, 5 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/keyboard_overlay/keyboard_overlay_view.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
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 13614653b4e875fb38fb8aeeb73aa800c9640cd5..95c3dd329ee90adabecfb260be189f91635352cf 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -78,14 +78,14 @@ class AcceleratorFilter;
class ActivationController;
class AppListController;
class CaptureController;
+class DisplayController;
class DragDropController;
class EventRewriterEventFilter;
class FocusCycler;
class MagnificationController;
-class DisplayController;
class MouseCursorEventFilter;
+class OverlayEventFilter;
class PanelLayoutManager;
-class PartialScreenshotEventFilter;
class ResizeShadowController;
class RootWindowController;
class RootWindowLayoutManager;
@@ -94,9 +94,9 @@ class ShadowController;
class ShelfLayoutManager;
class ShellContextMenu;
class SlowAnimationEventFilter;
-class SystemGestureEventFilter;
class StackingController;
class StatusAreaWidget;
+class SystemGestureEventFilter;
class TooltipController;
class TouchObserverHUD;
class VisibilityController;
@@ -261,8 +261,8 @@ class ASH_EXPORT Shell : aura::CursorDelegate {
internal::EventRewriterEventFilter* event_rewriter_filter() {
return event_rewriter_filter_.get();
}
- internal::PartialScreenshotEventFilter* partial_screenshot_filter() {
- return partial_screenshot_filter_.get();
+ internal::OverlayEventFilter* overlay_filter() {
+ return overlay_filter_.get();
}
DesktopBackgroundController* desktop_background_controller() {
return desktop_background_controller_.get();
@@ -445,7 +445,7 @@ class ASH_EXPORT Shell : aura::CursorDelegate {
// An event filter that pre-handles key events while the partial
// screenshot UI is active.
- scoped_ptr<internal::PartialScreenshotEventFilter> partial_screenshot_filter_;
+ scoped_ptr<internal::OverlayEventFilter> overlay_filter_;
// An event filter which handles system level gestures
scoped_ptr<internal::SystemGestureEventFilter> system_gesture_filter_;
« no previous file with comments | « ash/keyboard_overlay/keyboard_overlay_view.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698