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

Side by Side Diff: ash/shell.h

Issue 1921673005: mus: Add PointerWatcher for passively observing mouse and touch events (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 } 57 }
58 58
59 namespace ui { 59 namespace ui {
60 class DisplayConfigurator; 60 class DisplayConfigurator;
61 class Layer; 61 class Layer;
62 class UserActivityDetector; 62 class UserActivityDetector;
63 class UserActivityPowerManagerNotifier; 63 class UserActivityPowerManagerNotifier;
64 } 64 }
65 namespace views { 65 namespace views {
66 class NonClientFrameView; 66 class NonClientFrameView;
67 class PointerWatcher;
67 class Widget; 68 class Widget;
68 namespace corewm { 69 namespace corewm {
69 class TooltipController; 70 class TooltipController;
70 } 71 }
71 } 72 }
72 73
73 namespace wm { 74 namespace wm {
74 class AcceleratorFilter; 75 class AcceleratorFilter;
75 class CompoundEventFilter; 76 class CompoundEventFilter;
76 class ShadowController; 77 class ShadowController;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 class MagnificationController; 112 class MagnificationController;
112 class MaximizeModeController; 113 class MaximizeModeController;
113 class MaximizeModeWindowManager; 114 class MaximizeModeWindowManager;
114 class MediaDelegate; 115 class MediaDelegate;
115 class MouseCursorEventFilter; 116 class MouseCursorEventFilter;
116 class MruWindowTracker; 117 class MruWindowTracker;
117 class NewWindowDelegate; 118 class NewWindowDelegate;
118 class OverlayEventFilter; 119 class OverlayEventFilter;
119 class PartialMagnificationController; 120 class PartialMagnificationController;
120 class PartialScreenshotController; 121 class PartialScreenshotController;
122 class PointerWatcherDelegate;
121 class PowerButtonController; 123 class PowerButtonController;
122 class PowerEventObserver; 124 class PowerEventObserver;
123 class ProjectingObserver; 125 class ProjectingObserver;
124 class ResizeShadowController; 126 class ResizeShadowController;
125 class ResolutionNotificationController; 127 class ResolutionNotificationController;
126 class RootWindowController; 128 class RootWindowController;
127 class ScopedTargetRootWindow; 129 class ScopedTargetRootWindow;
128 class ScreenAsh; 130 class ScreenAsh;
129 class ScreenOrientationController; 131 class ScreenOrientationController;
130 class ScreenPositionController; 132 class ScreenPositionController;
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 // Deactivates the virtual keyboard. 331 // Deactivates the virtual keyboard.
330 void DeactivateKeyboard(); 332 void DeactivateKeyboard();
331 333
332 // Show shelf view if it was created hidden (before session has started). 334 // Show shelf view if it was created hidden (before session has started).
333 void ShowShelf(); 335 void ShowShelf();
334 336
335 // Adds/removes observer. 337 // Adds/removes observer.
336 void AddShellObserver(ShellObserver* observer); 338 void AddShellObserver(ShellObserver* observer);
337 void RemoveShellObserver(ShellObserver* observer); 339 void RemoveShellObserver(ShellObserver* observer);
338 340
341 void AddPointerWatcher(views::PointerWatcher* watcher);
342 void RemovePointerWatcher(views::PointerWatcher* watcher);
343
339 #if defined(OS_CHROMEOS) 344 #if defined(OS_CHROMEOS)
340 // Test if MaximizeModeWindowManager is not enabled, and if 345 // Test if MaximizeModeWindowManager is not enabled, and if
341 // MaximizeModeController is not currently setting a display rotation. Or if 346 // MaximizeModeController is not currently setting a display rotation. Or if
342 // the |resolution_notification_controller_| is not showing its confirmation 347 // the |resolution_notification_controller_| is not showing its confirmation
343 // dialog. If true then changes to display settings can be saved. 348 // dialog. If true then changes to display settings can be saved.
344 bool ShouldSaveDisplaySettings(); 349 bool ShouldSaveDisplaySettings();
345 #endif 350 #endif
346 351
347 AcceleratorController* accelerator_controller() { 352 AcceleratorController* accelerator_controller() {
348 return accelerator_controller_.get(); 353 return accelerator_controller_.get();
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
663 std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_; 668 std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_;
664 std::unique_ptr<AcceleratorController> accelerator_controller_; 669 std::unique_ptr<AcceleratorController> accelerator_controller_;
665 std::unique_ptr<ShellDelegate> delegate_; 670 std::unique_ptr<ShellDelegate> delegate_;
666 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_; 671 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
667 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_; 672 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
668 std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_; 673 std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
669 std::unique_ptr<SessionStateDelegate> session_state_delegate_; 674 std::unique_ptr<SessionStateDelegate> session_state_delegate_;
670 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; 675 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
671 std::unique_ptr<NewWindowDelegate> new_window_delegate_; 676 std::unique_ptr<NewWindowDelegate> new_window_delegate_;
672 std::unique_ptr<MediaDelegate> media_delegate_; 677 std::unique_ptr<MediaDelegate> media_delegate_;
678 std::unique_ptr<PointerWatcherDelegate> pointer_watcher_delegate_;
673 std::unique_ptr<ShelfDelegate> shelf_delegate_; 679 std::unique_ptr<ShelfDelegate> shelf_delegate_;
674 std::unique_ptr<ShelfItemDelegateManager> shelf_item_delegate_manager_; 680 std::unique_ptr<ShelfItemDelegateManager> shelf_item_delegate_manager_;
675 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_; 681 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
676 682
677 std::unique_ptr<ShelfModel> shelf_model_; 683 std::unique_ptr<ShelfModel> shelf_model_;
678 std::unique_ptr<WindowPositioner> window_positioner_; 684 std::unique_ptr<WindowPositioner> window_positioner_;
679 685
680 std::unique_ptr<DragDropController> drag_drop_controller_; 686 std::unique_ptr<DragDropController> drag_drop_controller_;
681 std::unique_ptr<ResizeShadowController> resize_shadow_controller_; 687 std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
682 std::unique_ptr<::wm::ShadowController> shadow_controller_; 688 std::unique_ptr<::wm::ShadowController> shadow_controller_;
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
790 bool in_mus_ = false; 796 bool in_mus_ = false;
791 797
792 std::unique_ptr<KeyboardUI> keyboard_ui_; 798 std::unique_ptr<KeyboardUI> keyboard_ui_;
793 799
794 DISALLOW_COPY_AND_ASSIGN(Shell); 800 DISALLOW_COPY_AND_ASSIGN(Shell);
795 }; 801 };
796 802
797 } // namespace ash 803 } // namespace ash
798 804
799 #endif // ASH_SHELL_H_ 805 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698