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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/keyboard_overlay/keyboard_overlay_view.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_SHELL_H_ 5 #ifndef ASH_SHELL_H_
6 #define ASH_SHELL_H_ 6 #define ASH_SHELL_H_
7 7
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 class UserActivityDetector; 71 class UserActivityDetector;
72 class UserWallpaperDelegate; 72 class UserWallpaperDelegate;
73 class VideoDetector; 73 class VideoDetector;
74 class WindowCycleController; 74 class WindowCycleController;
75 75
76 namespace internal { 76 namespace internal {
77 class AcceleratorFilter; 77 class AcceleratorFilter;
78 class ActivationController; 78 class ActivationController;
79 class AppListController; 79 class AppListController;
80 class CaptureController; 80 class CaptureController;
81 class DisplayController;
81 class DragDropController; 82 class DragDropController;
82 class EventRewriterEventFilter; 83 class EventRewriterEventFilter;
83 class FocusCycler; 84 class FocusCycler;
84 class MagnificationController; 85 class MagnificationController;
85 class DisplayController;
86 class MouseCursorEventFilter; 86 class MouseCursorEventFilter;
87 class OverlayEventFilter;
87 class PanelLayoutManager; 88 class PanelLayoutManager;
88 class PartialScreenshotEventFilter;
89 class ResizeShadowController; 89 class ResizeShadowController;
90 class RootWindowController; 90 class RootWindowController;
91 class RootWindowLayoutManager; 91 class RootWindowLayoutManager;
92 class ScreenPositionController; 92 class ScreenPositionController;
93 class ShadowController; 93 class ShadowController;
94 class ShelfLayoutManager; 94 class ShelfLayoutManager;
95 class ShellContextMenu; 95 class ShellContextMenu;
96 class SlowAnimationEventFilter; 96 class SlowAnimationEventFilter;
97 class SystemGestureEventFilter;
98 class StackingController; 97 class StackingController;
99 class StatusAreaWidget; 98 class StatusAreaWidget;
99 class SystemGestureEventFilter;
100 class TooltipController; 100 class TooltipController;
101 class TouchObserverHUD; 101 class TouchObserverHUD;
102 class VisibilityController; 102 class VisibilityController;
103 class WindowModalityController; 103 class WindowModalityController;
104 class WorkspaceController; 104 class WorkspaceController;
105 } 105 }
106 106
107 // Shell is a singleton object that presents the Shell API and implements the 107 // Shell is a singleton object that presents the Shell API and implements the
108 // RootWindow's delegate interface. 108 // RootWindow's delegate interface.
109 // 109 //
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 254
255 aura::shared::CompoundEventFilter* env_filter() { 255 aura::shared::CompoundEventFilter* env_filter() {
256 return env_filter_; 256 return env_filter_;
257 } 257 }
258 internal::TooltipController* tooltip_controller() { 258 internal::TooltipController* tooltip_controller() {
259 return tooltip_controller_.get(); 259 return tooltip_controller_.get();
260 } 260 }
261 internal::EventRewriterEventFilter* event_rewriter_filter() { 261 internal::EventRewriterEventFilter* event_rewriter_filter() {
262 return event_rewriter_filter_.get(); 262 return event_rewriter_filter_.get();
263 } 263 }
264 internal::PartialScreenshotEventFilter* partial_screenshot_filter() { 264 internal::OverlayEventFilter* overlay_filter() {
265 return partial_screenshot_filter_.get(); 265 return overlay_filter_.get();
266 } 266 }
267 DesktopBackgroundController* desktop_background_controller() { 267 DesktopBackgroundController* desktop_background_controller() {
268 return desktop_background_controller_.get(); 268 return desktop_background_controller_.get();
269 } 269 }
270 PowerButtonController* power_button_controller() { 270 PowerButtonController* power_button_controller() {
271 return power_button_controller_.get(); 271 return power_button_controller_.get();
272 } 272 }
273 UserActivityDetector* user_activity_detector() { 273 UserActivityDetector* user_activity_detector() {
274 return user_activity_detector_.get(); 274 return user_activity_detector_.get();
275 } 275 }
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 scoped_ptr<aura::FocusManager> focus_manager_; 438 scoped_ptr<aura::FocusManager> focus_manager_;
439 scoped_ptr<aura::client::UserActionClient> user_action_client_; 439 scoped_ptr<aura::client::UserActionClient> user_action_client_;
440 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_; 440 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_;
441 scoped_ptr<internal::ScreenPositionController> screen_position_controller_; 441 scoped_ptr<internal::ScreenPositionController> screen_position_controller_;
442 442
443 // An event filter that rewrites or drops an event. 443 // An event filter that rewrites or drops an event.
444 scoped_ptr<internal::EventRewriterEventFilter> event_rewriter_filter_; 444 scoped_ptr<internal::EventRewriterEventFilter> event_rewriter_filter_;
445 445
446 // An event filter that pre-handles key events while the partial 446 // An event filter that pre-handles key events while the partial
447 // screenshot UI is active. 447 // screenshot UI is active.
448 scoped_ptr<internal::PartialScreenshotEventFilter> partial_screenshot_filter_; 448 scoped_ptr<internal::OverlayEventFilter> overlay_filter_;
449 449
450 // An event filter which handles system level gestures 450 // An event filter which handles system level gestures
451 scoped_ptr<internal::SystemGestureEventFilter> system_gesture_filter_; 451 scoped_ptr<internal::SystemGestureEventFilter> system_gesture_filter_;
452 452
453 #if !defined(OS_MACOSX) 453 #if !defined(OS_MACOSX)
454 // An event filter that pre-handles global accelerators. 454 // An event filter that pre-handles global accelerators.
455 scoped_ptr<internal::AcceleratorFilter> accelerator_filter_; 455 scoped_ptr<internal::AcceleratorFilter> accelerator_filter_;
456 #endif 456 #endif
457 457
458 // An event filter that pre-handles all key events to send them to an IME. 458 // An event filter that pre-handles all key events to send them to an IME.
(...skipping 23 matching lines...) Expand all
482 482
483 // Used by ash/shell. 483 // Used by ash/shell.
484 content::BrowserContext* browser_context_; 484 content::BrowserContext* browser_context_;
485 485
486 DISALLOW_COPY_AND_ASSIGN(Shell); 486 DISALLOW_COPY_AND_ASSIGN(Shell);
487 }; 487 };
488 488
489 } // namespace ash 489 } // namespace ash
490 490
491 #endif // ASH_SHELL_H_ 491 #endif // ASH_SHELL_H_
OLDNEW
« 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