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

Side by Side Diff: ash/shell.h

Issue 1155013005: Refactoring the ownership of ui::InputMethod. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits. Created 5 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
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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 class NonClientFrameView; 58 class NonClientFrameView;
59 class Widget; 59 class Widget;
60 namespace corewm { 60 namespace corewm {
61 class TooltipController; 61 class TooltipController;
62 } 62 }
63 } 63 }
64 64
65 namespace wm { 65 namespace wm {
66 class AcceleratorFilter; 66 class AcceleratorFilter;
67 class CompoundEventFilter; 67 class CompoundEventFilter;
68 class InputMethodEventFilter;
69 class NestedAcceleratorController; 68 class NestedAcceleratorController;
70 class ShadowController; 69 class ShadowController;
71 class VisibilityController; 70 class VisibilityController;
72 class WindowModalityController; 71 class WindowModalityController;
73 } 72 }
74 73
75 namespace ash { 74 namespace ash {
76 75
77 class AcceleratorController; 76 class AcceleratorController;
78 class AccessibilityDelegate; 77 class AccessibilityDelegate;
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 // the |resolution_notification_controller_| is not showing its confirmation 338 // the |resolution_notification_controller_| is not showing its confirmation
340 // dialog. If true then changes to display settings can be saved. 339 // dialog. If true then changes to display settings can be saved.
341 bool ShouldSaveDisplaySettings(); 340 bool ShouldSaveDisplaySettings();
342 #endif 341 #endif
343 342
344 AcceleratorController* accelerator_controller() { 343 AcceleratorController* accelerator_controller() {
345 return accelerator_controller_.get(); 344 return accelerator_controller_.get();
346 } 345 }
347 346
348 DisplayManager* display_manager() { return display_manager_.get(); } 347 DisplayManager* display_manager() { return display_manager_.get(); }
349 ::wm::InputMethodEventFilter* input_method_filter() {
350 return input_method_filter_.get();
351 }
352 ::wm::CompoundEventFilter* env_filter() { 348 ::wm::CompoundEventFilter* env_filter() {
353 return env_filter_.get(); 349 return env_filter_.get();
354 } 350 }
355 views::corewm::TooltipController* tooltip_controller() { 351 views::corewm::TooltipController* tooltip_controller() {
356 return tooltip_controller_.get(); 352 return tooltip_controller_.get();
357 } 353 }
358 OverlayEventFilter* overlay_filter() { return overlay_filter_.get(); } 354 OverlayEventFilter* overlay_filter() { return overlay_filter_.get(); }
359 DesktopBackgroundController* desktop_background_controller() { 355 DesktopBackgroundController* desktop_background_controller() {
360 return desktop_background_controller_.get(); 356 return desktop_background_controller_.get();
361 } 357 }
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
697 693
698 // An event filter which handles moving and resizing windows. 694 // An event filter which handles moving and resizing windows.
699 scoped_ptr<ToplevelWindowEventHandler> toplevel_window_event_handler_; 695 scoped_ptr<ToplevelWindowEventHandler> toplevel_window_event_handler_;
700 696
701 // An event filter which handles system level gestures 697 // An event filter which handles system level gestures
702 scoped_ptr<SystemGestureEventFilter> system_gesture_filter_; 698 scoped_ptr<SystemGestureEventFilter> system_gesture_filter_;
703 699
704 // An event filter that pre-handles global accelerators. 700 // An event filter that pre-handles global accelerators.
705 scoped_ptr< ::wm::AcceleratorFilter> accelerator_filter_; 701 scoped_ptr< ::wm::AcceleratorFilter> accelerator_filter_;
706 702
707 // An event filter that pre-handles all key events to send them to an IME.
708 scoped_ptr< ::wm::InputMethodEventFilter> input_method_filter_;
709
710 scoped_ptr<DisplayManager> display_manager_; 703 scoped_ptr<DisplayManager> display_manager_;
711 704
712 scoped_ptr<LocaleNotificationController> locale_notification_controller_; 705 scoped_ptr<LocaleNotificationController> locale_notification_controller_;
713 706
714 #if defined(OS_CHROMEOS) 707 #if defined(OS_CHROMEOS)
715 scoped_ptr<PowerEventObserver> power_event_observer_; 708 scoped_ptr<PowerEventObserver> power_event_observer_;
716 scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; 709 scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_;
717 scoped_ptr<VideoActivityNotifier> video_activity_notifier_; 710 scoped_ptr<VideoActivityNotifier> video_activity_notifier_;
718 scoped_ptr<StickyKeysController> sticky_keys_controller_; 711 scoped_ptr<StickyKeysController> sticky_keys_controller_;
719 scoped_ptr<ResolutionNotificationController> 712 scoped_ptr<ResolutionNotificationController>
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
766 759
767 // Injected content::GPUDataManager support. 760 // Injected content::GPUDataManager support.
768 scoped_ptr<GPUSupport> gpu_support_; 761 scoped_ptr<GPUSupport> gpu_support_;
769 762
770 DISALLOW_COPY_AND_ASSIGN(Shell); 763 DISALLOW_COPY_AND_ASSIGN(Shell);
771 }; 764 };
772 765
773 } // namespace ash 766 } // namespace ash
774 767
775 #endif // ASH_SHELL_H_ 768 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698