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

Side by Side Diff: ash/shell.h

Issue 2617043003: Move TouchTransformerController to ui/display/. (Closed)
Patch Set: Make DEPS for one file. Created 3 years, 11 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
« no previous file with comments | « ash/BUILD.gn ('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 <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 class ScreenPositionController; 104 class ScreenPositionController;
105 class SessionStateDelegate; 105 class SessionStateDelegate;
106 class ShellDelegate; 106 class ShellDelegate;
107 struct ShellInitParams; 107 struct ShellInitParams;
108 class ShutdownObserver; 108 class ShutdownObserver;
109 class StickyKeysController; 109 class StickyKeysController;
110 class SystemGestureEventFilter; 110 class SystemGestureEventFilter;
111 class SystemModalContainerEventFilter; 111 class SystemModalContainerEventFilter;
112 class SystemTray; 112 class SystemTray;
113 class ToplevelWindowEventHandler; 113 class ToplevelWindowEventHandler;
114 class TouchTransformerController; 114 class AshTouchTransformController;
115 class ScreenLayoutObserver; 115 class ScreenLayoutObserver;
116 class VirtualKeyboardController; 116 class VirtualKeyboardController;
117 class VideoActivityNotifier; 117 class VideoActivityNotifier;
118 class VideoDetector; 118 class VideoDetector;
119 class WebNotificationTray; 119 class WebNotificationTray;
120 class WindowPositioner; 120 class WindowPositioner;
121 class WindowTreeHostManager; 121 class WindowTreeHostManager;
122 class WmShellAura; 122 class WmShellAura;
123 class WmWindow; 123 class WmWindow;
124 124
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 LockStateController* lock_state_controller() { 251 LockStateController* lock_state_controller() {
252 return lock_state_controller_.get(); 252 return lock_state_controller_.get();
253 } 253 }
254 VideoDetector* video_detector() { return video_detector_.get(); } 254 VideoDetector* video_detector() { return video_detector_.get(); }
255 WindowTreeHostManager* window_tree_host_manager() { 255 WindowTreeHostManager* window_tree_host_manager() {
256 return window_tree_host_manager_.get(); 256 return window_tree_host_manager_.get();
257 } 257 }
258 PowerEventObserver* power_event_observer() { 258 PowerEventObserver* power_event_observer() {
259 return power_event_observer_.get(); 259 return power_event_observer_.get();
260 } 260 }
261 TouchTransformerController* touch_transformer_controller() { 261 AshTouchTransformController* touch_transformer_controller() {
262 return touch_transformer_controller_.get(); 262 return touch_transformer_controller_.get();
263 } 263 }
264 LaserPointerController* laser_pointer_controller() { 264 LaserPointerController* laser_pointer_controller() {
265 return laser_pointer_controller_.get(); 265 return laser_pointer_controller_.get();
266 } 266 }
267 PartialMagnificationController* partial_magnification_controller() { 267 PartialMagnificationController* partial_magnification_controller() {
268 return partial_magnification_controller_.get(); 268 return partial_magnification_controller_.get();
269 } 269 }
270 ScreenshotController* screenshot_controller() { 270 ScreenshotController* screenshot_controller() {
271 return screenshot_controller_.get(); 271 return screenshot_controller_.get();
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 // Listens for output changes and updates the display manager. 496 // Listens for output changes and updates the display manager.
497 std::unique_ptr<display::DisplayChangeObserver> display_change_observer_; 497 std::unique_ptr<display::DisplayChangeObserver> display_change_observer_;
498 498
499 // Listens for shutdown and updates DisplayConfigurator. 499 // Listens for shutdown and updates DisplayConfigurator.
500 std::unique_ptr<ShutdownObserver> shutdown_observer_; 500 std::unique_ptr<ShutdownObserver> shutdown_observer_;
501 501
502 // Implements content::ScreenOrientationController for ChromeOS 502 // Implements content::ScreenOrientationController for ChromeOS
503 std::unique_ptr<ScreenOrientationController> screen_orientation_controller_; 503 std::unique_ptr<ScreenOrientationController> screen_orientation_controller_;
504 std::unique_ptr<ScreenLayoutObserver> screen_layout_observer_; 504 std::unique_ptr<ScreenLayoutObserver> screen_layout_observer_;
505 505
506 std::unique_ptr<TouchTransformerController> touch_transformer_controller_; 506 std::unique_ptr<AshTouchTransformController> touch_transformer_controller_;
507 507
508 std::unique_ptr<ui::EventHandler> magnifier_key_scroll_handler_; 508 std::unique_ptr<ui::EventHandler> magnifier_key_scroll_handler_;
509 std::unique_ptr<ui::EventHandler> speech_feedback_handler_; 509 std::unique_ptr<ui::EventHandler> speech_feedback_handler_;
510 std::unique_ptr<LaserPointerController> laser_pointer_controller_; 510 std::unique_ptr<LaserPointerController> laser_pointer_controller_;
511 std::unique_ptr<PartialMagnificationController> 511 std::unique_ptr<PartialMagnificationController>
512 partial_magnification_controller_; 512 partial_magnification_controller_;
513 513
514 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a 514 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a
515 // pointer to vend to test code. 515 // pointer to vend to test code.
516 AshNativeCursorManager* native_cursor_manager_; 516 AshNativeCursorManager* native_cursor_manager_;
(...skipping 11 matching lines...) Expand all
528 std::unique_ptr<GPUSupport> gpu_support_; 528 std::unique_ptr<GPUSupport> gpu_support_;
529 529
530 std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_; 530 std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_;
531 531
532 DISALLOW_COPY_AND_ASSIGN(Shell); 532 DISALLOW_COPY_AND_ASSIGN(Shell);
533 }; 533 };
534 534
535 } // namespace ash 535 } // namespace ash
536 536
537 #endif // ASH_SHELL_H_ 537 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/BUILD.gn ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698