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

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: rebase Created 4 years, 7 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/pointer_watcher_delegate_aura.cc ('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 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 class MagnificationController; 113 class MagnificationController;
113 class MaximizeModeController; 114 class MaximizeModeController;
114 class MaximizeModeWindowManager; 115 class MaximizeModeWindowManager;
115 class MediaDelegate; 116 class MediaDelegate;
116 class MouseCursorEventFilter; 117 class MouseCursorEventFilter;
117 class MruWindowTracker; 118 class MruWindowTracker;
118 class NewWindowDelegate; 119 class NewWindowDelegate;
119 class OverlayEventFilter; 120 class OverlayEventFilter;
120 class PartialMagnificationController; 121 class PartialMagnificationController;
121 class PartialScreenshotController; 122 class PartialScreenshotController;
123 class PointerWatcherDelegate;
122 class PowerButtonController; 124 class PowerButtonController;
123 class PowerEventObserver; 125 class PowerEventObserver;
124 class ProjectingObserver; 126 class ProjectingObserver;
125 class ResizeShadowController; 127 class ResizeShadowController;
126 class ResolutionNotificationController; 128 class ResolutionNotificationController;
127 class RootWindowController; 129 class RootWindowController;
128 class ScopedTargetRootWindow; 130 class ScopedTargetRootWindow;
129 class ScreenAsh; 131 class ScreenAsh;
130 class ScreenOrientationController; 132 class ScreenOrientationController;
131 class ScreenPositionController; 133 class ScreenPositionController;
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 // Deactivates the virtual keyboard. 332 // Deactivates the virtual keyboard.
331 void DeactivateKeyboard(); 333 void DeactivateKeyboard();
332 334
333 // Show shelf view if it was created hidden (before session has started). 335 // Show shelf view if it was created hidden (before session has started).
334 void ShowShelf(); 336 void ShowShelf();
335 337
336 // Adds/removes observer. 338 // Adds/removes observer.
337 void AddShellObserver(ShellObserver* observer); 339 void AddShellObserver(ShellObserver* observer);
338 void RemoveShellObserver(ShellObserver* observer); 340 void RemoveShellObserver(ShellObserver* observer);
339 341
342 void AddPointerWatcher(views::PointerWatcher* watcher);
343 void RemovePointerWatcher(views::PointerWatcher* watcher);
344
340 #if defined(OS_CHROMEOS) 345 #if defined(OS_CHROMEOS)
341 // Test if MaximizeModeWindowManager is not enabled, and if 346 // Test if MaximizeModeWindowManager is not enabled, and if
342 // MaximizeModeController is not currently setting a display rotation. Or if 347 // MaximizeModeController is not currently setting a display rotation. Or if
343 // the |resolution_notification_controller_| is not showing its confirmation 348 // the |resolution_notification_controller_| is not showing its confirmation
344 // dialog. If true then changes to display settings can be saved. 349 // dialog. If true then changes to display settings can be saved.
345 bool ShouldSaveDisplaySettings(); 350 bool ShouldSaveDisplaySettings();
346 #endif 351 #endif
347 352
348 AcceleratorController* accelerator_controller() { 353 AcceleratorController* accelerator_controller() {
349 return accelerator_controller_.get(); 354 return accelerator_controller_.get();
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_; 677 std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_;
673 std::unique_ptr<AcceleratorController> accelerator_controller_; 678 std::unique_ptr<AcceleratorController> accelerator_controller_;
674 std::unique_ptr<ShellDelegate> delegate_; 679 std::unique_ptr<ShellDelegate> delegate_;
675 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_; 680 std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
676 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_; 681 std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
677 std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_; 682 std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
678 std::unique_ptr<SessionStateDelegate> session_state_delegate_; 683 std::unique_ptr<SessionStateDelegate> session_state_delegate_;
679 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; 684 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
680 std::unique_ptr<NewWindowDelegate> new_window_delegate_; 685 std::unique_ptr<NewWindowDelegate> new_window_delegate_;
681 std::unique_ptr<MediaDelegate> media_delegate_; 686 std::unique_ptr<MediaDelegate> media_delegate_;
687 std::unique_ptr<PointerWatcherDelegate> pointer_watcher_delegate_;
682 std::unique_ptr<ShelfDelegate> shelf_delegate_; 688 std::unique_ptr<ShelfDelegate> shelf_delegate_;
683 std::unique_ptr<ShelfItemDelegateManager> shelf_item_delegate_manager_; 689 std::unique_ptr<ShelfItemDelegateManager> shelf_item_delegate_manager_;
684 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_; 690 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
685 691
686 std::unique_ptr<ShelfModel> shelf_model_; 692 std::unique_ptr<ShelfModel> shelf_model_;
687 std::unique_ptr<WindowPositioner> window_positioner_; 693 std::unique_ptr<WindowPositioner> window_positioner_;
688 694
689 std::unique_ptr<DragDropController> drag_drop_controller_; 695 std::unique_ptr<DragDropController> drag_drop_controller_;
690 std::unique_ptr<ResizeShadowController> resize_shadow_controller_; 696 std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
691 std::unique_ptr<::wm::ShadowController> shadow_controller_; 697 std::unique_ptr<::wm::ShadowController> shadow_controller_;
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
800 bool in_mus_ = false; 806 bool in_mus_ = false;
801 807
802 std::unique_ptr<KeyboardUI> keyboard_ui_; 808 std::unique_ptr<KeyboardUI> keyboard_ui_;
803 809
804 DISALLOW_COPY_AND_ASSIGN(Shell); 810 DISALLOW_COPY_AND_ASSIGN(Shell);
805 }; 811 };
806 812
807 } // namespace ash 813 } // namespace ash
808 814
809 #endif // ASH_SHELL_H_ 815 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/pointer_watcher_delegate_aura.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698