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

Side by Side Diff: ash/shell.h

Issue 191223007: Move touch CTM from X into Chrome (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: move CTM update code into a separate file ash/touch/touch_ctm_controller.cc Created 6 years, 9 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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 class ShelfDelegate; 98 class ShelfDelegate;
99 class ShelfItemDelegateManager; 99 class ShelfItemDelegateManager;
100 class ShelfModel; 100 class ShelfModel;
101 class ShellDelegate; 101 class ShellDelegate;
102 class ShellObserver; 102 class ShellObserver;
103 class StickyKeysController; 103 class StickyKeysController;
104 class SystemTray; 104 class SystemTray;
105 class SystemTrayDelegate; 105 class SystemTrayDelegate;
106 class SystemTrayNotifier; 106 class SystemTrayNotifier;
107 class ToplevelWindowEventHandler; 107 class ToplevelWindowEventHandler;
108 class TouchCTMController;
108 class UserActivityDetector; 109 class UserActivityDetector;
109 class UserWallpaperDelegate; 110 class UserWallpaperDelegate;
110 class VideoDetector; 111 class VideoDetector;
111 class WebNotificationTray; 112 class WebNotificationTray;
112 class WindowCycleController; 113 class WindowCycleController;
113 class WindowPositioner; 114 class WindowPositioner;
114 class WindowSelectorController; 115 class WindowSelectorController;
115 116
116 namespace internal { 117 namespace internal {
117 class AcceleratorFilter; 118 class AcceleratorFilter;
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
647 scoped_ptr<DesktopBackgroundController> desktop_background_controller_; 648 scoped_ptr<DesktopBackgroundController> desktop_background_controller_;
648 scoped_ptr<PowerButtonController> power_button_controller_; 649 scoped_ptr<PowerButtonController> power_button_controller_;
649 scoped_ptr<LockStateController> lock_state_controller_; 650 scoped_ptr<LockStateController> lock_state_controller_;
650 scoped_ptr<MruWindowTracker> mru_window_tracker_; 651 scoped_ptr<MruWindowTracker> mru_window_tracker_;
651 scoped_ptr<UserActivityDetector> user_activity_detector_; 652 scoped_ptr<UserActivityDetector> user_activity_detector_;
652 scoped_ptr<VideoDetector> video_detector_; 653 scoped_ptr<VideoDetector> video_detector_;
653 scoped_ptr<WindowCycleController> window_cycle_controller_; 654 scoped_ptr<WindowCycleController> window_cycle_controller_;
654 scoped_ptr<WindowSelectorController> window_selector_controller_; 655 scoped_ptr<WindowSelectorController> window_selector_controller_;
655 scoped_ptr<internal::FocusCycler> focus_cycler_; 656 scoped_ptr<internal::FocusCycler> focus_cycler_;
656 scoped_ptr<DisplayController> display_controller_; 657 scoped_ptr<DisplayController> display_controller_;
658 scoped_ptr<TouchCTMController> touch_ctm_controller_;
657 scoped_ptr<HighContrastController> high_contrast_controller_; 659 scoped_ptr<HighContrastController> high_contrast_controller_;
658 scoped_ptr<MagnificationController> magnification_controller_; 660 scoped_ptr<MagnificationController> magnification_controller_;
659 scoped_ptr<PartialMagnificationController> partial_magnification_controller_; 661 scoped_ptr<PartialMagnificationController> partial_magnification_controller_;
660 scoped_ptr<AutoclickController> autoclick_controller_; 662 scoped_ptr<AutoclickController> autoclick_controller_;
661 scoped_ptr<aura::client::FocusClient> focus_client_; 663 scoped_ptr<aura::client::FocusClient> focus_client_;
662 aura::client::ActivationClient* activation_client_; 664 aura::client::ActivationClient* activation_client_;
663 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_; 665 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_;
664 scoped_ptr<internal::ScreenPositionController> screen_position_controller_; 666 scoped_ptr<internal::ScreenPositionController> screen_position_controller_;
665 scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_; 667 scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_;
666 scoped_ptr<internal::EventClientImpl> event_client_; 668 scoped_ptr<internal::EventClientImpl> event_client_;
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
738 740
739 // Injected content::GPUDataManager support. 741 // Injected content::GPUDataManager support.
740 scoped_ptr<GPUSupport> gpu_support_; 742 scoped_ptr<GPUSupport> gpu_support_;
741 743
742 DISALLOW_COPY_AND_ASSIGN(Shell); 744 DISALLOW_COPY_AND_ASSIGN(Shell);
743 }; 745 };
744 746
745 } // namespace ash 747 } // namespace ash
746 748
747 #endif // ASH_SHELL_H_ 749 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698