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

Side by Side 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, 6 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
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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 } 55 }
56 namespace views { 56 namespace views {
57 class NonClientFrameView; 57 class NonClientFrameView;
58 class Widget; 58 class Widget;
59 namespace corewm { 59 namespace corewm {
60 class TooltipController; 60 class TooltipController;
61 } 61 }
62 } 62 }
63 63
64 namespace wm { 64 namespace wm {
65 class AcceleratorFilter;
65 class CompoundEventFilter; 66 class CompoundEventFilter;
66 class InputMethodEventFilter; 67 class InputMethodEventFilter;
67 class NestedAcceleratorController; 68 class NestedAcceleratorController;
68 class ShadowController; 69 class ShadowController;
69 class VisibilityController; 70 class VisibilityController;
70 class UserActivityDetector; 71 class UserActivityDetector;
71 class WindowModalityController; 72 class WindowModalityController;
72 } 73 }
73 74
74 namespace ash { 75 namespace ash {
75 76
76 class AcceleratorController; 77 class AcceleratorController;
77 class AccelerometerController; 78 class AccelerometerController;
78 class AcceleratorFilter;
79 class AccessibilityDelegate; 79 class AccessibilityDelegate;
80 class AppListController; 80 class AppListController;
81 class AshNativeCursorManager; 81 class AshNativeCursorManager;
82 class AutoclickController; 82 class AutoclickController;
83 class BluetoothNotificationController; 83 class BluetoothNotificationController;
84 class CaptureController; 84 class CaptureController;
85 class DesktopBackgroundController; 85 class DesktopBackgroundController;
86 class DisplayChangeObserver; 86 class DisplayChangeObserver;
87 class DisplayConfiguratorAnimation; 87 class DisplayConfiguratorAnimation;
88 class DisplayController; 88 class DisplayController;
(...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after
686 // An event filter for logging keyboard-related metrics. 686 // An event filter for logging keyboard-related metrics.
687 scoped_ptr<KeyboardUMAEventFilter> keyboard_metrics_filter_; 687 scoped_ptr<KeyboardUMAEventFilter> keyboard_metrics_filter_;
688 688
689 // An event filter which handles moving and resizing windows. 689 // An event filter which handles moving and resizing windows.
690 scoped_ptr<ToplevelWindowEventHandler> toplevel_window_event_handler_; 690 scoped_ptr<ToplevelWindowEventHandler> toplevel_window_event_handler_;
691 691
692 // An event filter which handles system level gestures 692 // An event filter which handles system level gestures
693 scoped_ptr<SystemGestureEventFilter> system_gesture_filter_; 693 scoped_ptr<SystemGestureEventFilter> system_gesture_filter_;
694 694
695 // An event filter that pre-handles global accelerators. 695 // An event filter that pre-handles global accelerators.
696 scoped_ptr<AcceleratorFilter> accelerator_filter_; 696 scoped_ptr< ::wm::AcceleratorFilter> accelerator_filter_;
697 697
698 // An event filter that pre-handles all key events to send them to an IME. 698 // An event filter that pre-handles all key events to send them to an IME.
699 scoped_ptr< ::wm::InputMethodEventFilter> input_method_filter_; 699 scoped_ptr< ::wm::InputMethodEventFilter> input_method_filter_;
700 700
701 scoped_ptr<DisplayManager> display_manager_; 701 scoped_ptr<DisplayManager> display_manager_;
702 scoped_ptr<base::WeakPtrFactory<DisplayManager> > 702 scoped_ptr<base::WeakPtrFactory<DisplayManager> >
703 weak_display_manager_factory_; 703 weak_display_manager_factory_;
704 704
705 scoped_ptr<LocaleNotificationController> locale_notification_controller_; 705 scoped_ptr<LocaleNotificationController> locale_notification_controller_;
706 706
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 760
761 // Injected content::GPUDataManager support. 761 // Injected content::GPUDataManager support.
762 scoped_ptr<GPUSupport> gpu_support_; 762 scoped_ptr<GPUSupport> gpu_support_;
763 763
764 DISALLOW_COPY_AND_ASSIGN(Shell); 764 DISALLOW_COPY_AND_ASSIGN(Shell);
765 }; 765 };
766 766
767 } // namespace ash 767 } // namespace ash
768 768
769 #endif // ASH_SHELL_H_ 769 #endif // ASH_SHELL_H_
OLDNEW
« 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