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

Side by Side Diff: ash/shell.h

Issue 2267023003: ash: Eliminate PointerWatcherDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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_unittest.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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 } 51 }
52 52
53 namespace ui { 53 namespace ui {
54 class DisplayConfigurator; 54 class DisplayConfigurator;
55 class Layer; 55 class Layer;
56 class UserActivityDetector; 56 class UserActivityDetector;
57 class UserActivityPowerManagerNotifier; 57 class UserActivityPowerManagerNotifier;
58 } 58 }
59 namespace views { 59 namespace views {
60 class NonClientFrameView; 60 class NonClientFrameView;
61 class PointerWatcher;
62 class Widget; 61 class Widget;
63 namespace corewm { 62 namespace corewm {
64 class TooltipController; 63 class TooltipController;
65 } 64 }
66 } 65 }
67 66
68 namespace wm { 67 namespace wm {
69 class AcceleratorFilter; 68 class AcceleratorFilter;
70 class CompoundEventFilter; 69 class CompoundEventFilter;
71 class ShadowController; 70 class ShadowController;
(...skipping 23 matching lines...) Expand all
95 class HighContrastController; 94 class HighContrastController;
96 class ImmersiveHandlerFactoryAsh; 95 class ImmersiveHandlerFactoryAsh;
97 class LinkHandlerModelFactory; 96 class LinkHandlerModelFactory;
98 class LocaleNotificationController; 97 class LocaleNotificationController;
99 class LockStateController; 98 class LockStateController;
100 enum class LoginStatus; 99 enum class LoginStatus;
101 class MagnificationController; 100 class MagnificationController;
102 class MouseCursorEventFilter; 101 class MouseCursorEventFilter;
103 class OverlayEventFilter; 102 class OverlayEventFilter;
104 class PartialMagnificationController; 103 class PartialMagnificationController;
105 class PointerWatcherDelegate;
106 class PowerButtonController; 104 class PowerButtonController;
107 class PowerEventObserver; 105 class PowerEventObserver;
108 class ProjectingObserver; 106 class ProjectingObserver;
109 class ResizeShadowController; 107 class ResizeShadowController;
110 class ResolutionNotificationController; 108 class ResolutionNotificationController;
111 class RootWindowController; 109 class RootWindowController;
112 class ScopedOverviewAnimationSettingsFactoryAura; 110 class ScopedOverviewAnimationSettingsFactoryAura;
113 class ScreenAsh; 111 class ScreenAsh;
114 class ScreenOrientationController; 112 class ScreenOrientationController;
115 class ScreenshotController; 113 class ScreenshotController;
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 // Creates a virtual keyboard. Deletes the old virtual keyboard if it already 247 // Creates a virtual keyboard. Deletes the old virtual keyboard if it already
250 // exists. 248 // exists.
251 void CreateKeyboard(); 249 void CreateKeyboard();
252 250
253 // Deactivates the virtual keyboard. 251 // Deactivates the virtual keyboard.
254 void DeactivateKeyboard(); 252 void DeactivateKeyboard();
255 253
256 // Show shelf view if it was created hidden (before session has started). 254 // Show shelf view if it was created hidden (before session has started).
257 void ShowShelf(); 255 void ShowShelf();
258 256
259 void AddPointerWatcher(views::PointerWatcher* watcher, bool wants_moves);
260 void RemovePointerWatcher(views::PointerWatcher* watcher);
261
262 #if defined(OS_CHROMEOS) 257 #if defined(OS_CHROMEOS)
263 // Test if MaximizeModeWindowManager is not enabled, and if 258 // Test if MaximizeModeWindowManager is not enabled, and if
264 // MaximizeModeController is not currently setting a display rotation. Or if 259 // MaximizeModeController is not currently setting a display rotation. Or if
265 // the |resolution_notification_controller_| is not showing its confirmation 260 // the |resolution_notification_controller_| is not showing its confirmation
266 // dialog. If true then changes to display settings can be saved. 261 // dialog. If true then changes to display settings can be saved.
267 bool ShouldSaveDisplaySettings(); 262 bool ShouldSaveDisplaySettings();
268 #endif 263 #endif
269 264
270 AcceleratorControllerDelegateAura* accelerator_controller_delegate() { 265 AcceleratorControllerDelegateAura* accelerator_controller_delegate() {
271 return accelerator_controller_delegate_.get(); 266 return accelerator_controller_delegate_.get();
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 // The CompoundEventFilter owned by aura::Env object. 490 // The CompoundEventFilter owned by aura::Env object.
496 std::unique_ptr<::wm::CompoundEventFilter> env_filter_; 491 std::unique_ptr<::wm::CompoundEventFilter> env_filter_;
497 492
498 std::vector<WindowAndBoundsPair> to_restore_; 493 std::vector<WindowAndBoundsPair> to_restore_;
499 494
500 std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_; 495 std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_;
501 std::unique_ptr<AcceleratorControllerDelegateAura> 496 std::unique_ptr<AcceleratorControllerDelegateAura>
502 accelerator_controller_delegate_; 497 accelerator_controller_delegate_;
503 std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_; 498 std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
504 std::unique_ptr<SessionStateDelegate> session_state_delegate_; 499 std::unique_ptr<SessionStateDelegate> session_state_delegate_;
505 std::unique_ptr<PointerWatcherDelegate> pointer_watcher_delegate_;
506 std::unique_ptr<WindowPositioner> window_positioner_; 500 std::unique_ptr<WindowPositioner> window_positioner_;
507 501
508 std::unique_ptr<DragDropController> drag_drop_controller_; 502 std::unique_ptr<DragDropController> drag_drop_controller_;
509 std::unique_ptr<ResizeShadowController> resize_shadow_controller_; 503 std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
510 std::unique_ptr<::wm::ShadowController> shadow_controller_; 504 std::unique_ptr<::wm::ShadowController> shadow_controller_;
511 std::unique_ptr<::wm::VisibilityController> visibility_controller_; 505 std::unique_ptr<::wm::VisibilityController> visibility_controller_;
512 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_; 506 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_;
513 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_; 507 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_;
514 std::unique_ptr<DesktopBackgroundController> desktop_background_controller_; 508 std::unique_ptr<DesktopBackgroundController> desktop_background_controller_;
515 LinkHandlerModelFactory* link_handler_model_factory_; 509 LinkHandlerModelFactory* link_handler_model_factory_;
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
605 base::SequencedWorkerPool* blocking_pool_; 599 base::SequencedWorkerPool* blocking_pool_;
606 600
607 bool in_mus_ = false; 601 bool in_mus_ = false;
608 602
609 DISALLOW_COPY_AND_ASSIGN(Shell); 603 DISALLOW_COPY_AND_ASSIGN(Shell);
610 }; 604 };
611 605
612 } // namespace ash 606 } // namespace ash
613 607
614 #endif // ASH_SHELL_H_ 608 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/pointer_watcher_delegate_aura_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698