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

Side by Side Diff: ash/shell.h

Issue 2158273003: mus: Rename .*PointerWatcher.* to .*PointerDownWatcher.*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 5 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/shelf/shelf_tooltip_manager.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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 } 55 }
56 56
57 namespace ui { 57 namespace ui {
58 class DisplayConfigurator; 58 class DisplayConfigurator;
59 class Layer; 59 class Layer;
60 class UserActivityDetector; 60 class UserActivityDetector;
61 class UserActivityPowerManagerNotifier; 61 class UserActivityPowerManagerNotifier;
62 } 62 }
63 namespace views { 63 namespace views {
64 class NonClientFrameView; 64 class NonClientFrameView;
65 class PointerWatcher; 65 class PointerDownWatcher;
66 class Widget; 66 class Widget;
67 namespace corewm { 67 namespace corewm {
68 class TooltipController; 68 class TooltipController;
69 } 69 }
70 } 70 }
71 71
72 namespace wm { 72 namespace wm {
73 class AcceleratorFilter; 73 class AcceleratorFilter;
74 class CompoundEventFilter; 74 class CompoundEventFilter;
75 class ShadowController; 75 class ShadowController;
(...skipping 26 matching lines...) Expand all
102 class KeyboardUMAEventFilter; 102 class KeyboardUMAEventFilter;
103 class LinkHandlerModelFactory; 103 class LinkHandlerModelFactory;
104 class LocaleNotificationController; 104 class LocaleNotificationController;
105 class LockStateController; 105 class LockStateController;
106 enum class LoginStatus; 106 enum class LoginStatus;
107 class MagnificationController; 107 class MagnificationController;
108 class MouseCursorEventFilter; 108 class MouseCursorEventFilter;
109 class NewWindowDelegate; 109 class NewWindowDelegate;
110 class OverlayEventFilter; 110 class OverlayEventFilter;
111 class PartialMagnificationController; 111 class PartialMagnificationController;
112 class PointerWatcherDelegate; 112 class PointerDownWatcherDelegate;
113 class PowerButtonController; 113 class PowerButtonController;
114 class PowerEventObserver; 114 class PowerEventObserver;
115 class ProjectingObserver; 115 class ProjectingObserver;
116 class ResizeShadowController; 116 class ResizeShadowController;
117 class ResolutionNotificationController; 117 class ResolutionNotificationController;
118 class RootWindowController; 118 class RootWindowController;
119 class ScopedOverviewAnimationSettingsFactoryAura; 119 class ScopedOverviewAnimationSettingsFactoryAura;
120 class ScopedTargetRootWindow; 120 class ScopedTargetRootWindow;
121 class ScreenAsh; 121 class ScreenAsh;
122 class ScreenOrientationController; 122 class ScreenOrientationController;
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 // Creates a virtual keyboard. Deletes the old virtual keyboard if it already 291 // Creates a virtual keyboard. Deletes the old virtual keyboard if it already
292 // exists. 292 // exists.
293 void CreateKeyboard(); 293 void CreateKeyboard();
294 294
295 // Deactivates the virtual keyboard. 295 // Deactivates the virtual keyboard.
296 void DeactivateKeyboard(); 296 void DeactivateKeyboard();
297 297
298 // Show shelf view if it was created hidden (before session has started). 298 // Show shelf view if it was created hidden (before session has started).
299 void ShowShelf(); 299 void ShowShelf();
300 300
301 void AddPointerWatcher(views::PointerWatcher* watcher); 301 void AddPointerDownWatcher(views::PointerDownWatcher* watcher);
302 void RemovePointerWatcher(views::PointerWatcher* watcher); 302 void RemovePointerDownWatcher(views::PointerDownWatcher* watcher);
303 303
304 #if defined(OS_CHROMEOS) 304 #if defined(OS_CHROMEOS)
305 // Test if MaximizeModeWindowManager is not enabled, and if 305 // Test if MaximizeModeWindowManager is not enabled, and if
306 // MaximizeModeController is not currently setting a display rotation. Or if 306 // MaximizeModeController is not currently setting a display rotation. Or if
307 // the |resolution_notification_controller_| is not showing its confirmation 307 // the |resolution_notification_controller_| is not showing its confirmation
308 // dialog. If true then changes to display settings can be saved. 308 // dialog. If true then changes to display settings can be saved.
309 bool ShouldSaveDisplaySettings(); 309 bool ShouldSaveDisplaySettings();
310 #endif 310 #endif
311 311
312 AcceleratorController* accelerator_controller() { 312 AcceleratorController* accelerator_controller() {
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
579 // The CompoundEventFilter owned by aura::Env object. 579 // The CompoundEventFilter owned by aura::Env object.
580 std::unique_ptr<::wm::CompoundEventFilter> env_filter_; 580 std::unique_ptr<::wm::CompoundEventFilter> env_filter_;
581 581
582 std::vector<WindowAndBoundsPair> to_restore_; 582 std::vector<WindowAndBoundsPair> to_restore_;
583 583
584 std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_; 584 std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_;
585 std::unique_ptr<AcceleratorController> accelerator_controller_; 585 std::unique_ptr<AcceleratorController> accelerator_controller_;
586 std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_; 586 std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
587 std::unique_ptr<SessionStateDelegate> session_state_delegate_; 587 std::unique_ptr<SessionStateDelegate> session_state_delegate_;
588 std::unique_ptr<NewWindowDelegate> new_window_delegate_; 588 std::unique_ptr<NewWindowDelegate> new_window_delegate_;
589 std::unique_ptr<PointerWatcherDelegate> pointer_watcher_delegate_; 589 std::unique_ptr<PointerDownWatcherDelegate> pointer_down_watcher_delegate_;
590 std::unique_ptr<ShelfDelegate> shelf_delegate_; 590 std::unique_ptr<ShelfDelegate> shelf_delegate_;
591 std::unique_ptr<ShelfItemDelegateManager> shelf_item_delegate_manager_; 591 std::unique_ptr<ShelfItemDelegateManager> shelf_item_delegate_manager_;
592 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_; 592 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
593 593
594 std::unique_ptr<ShelfModel> shelf_model_; 594 std::unique_ptr<ShelfModel> shelf_model_;
595 std::unique_ptr<WindowPositioner> window_positioner_; 595 std::unique_ptr<WindowPositioner> window_positioner_;
596 596
597 std::unique_ptr<DragDropController> drag_drop_controller_; 597 std::unique_ptr<DragDropController> drag_drop_controller_;
598 std::unique_ptr<ResizeShadowController> resize_shadow_controller_; 598 std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
599 std::unique_ptr<::wm::ShadowController> shadow_controller_; 599 std::unique_ptr<::wm::ShadowController> shadow_controller_;
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
697 base::SequencedWorkerPool* blocking_pool_; 697 base::SequencedWorkerPool* blocking_pool_;
698 698
699 bool in_mus_ = false; 699 bool in_mus_ = false;
700 700
701 DISALLOW_COPY_AND_ASSIGN(Shell); 701 DISALLOW_COPY_AND_ASSIGN(Shell);
702 }; 702 };
703 703
704 } // namespace ash 704 } // namespace ash
705 705
706 #endif // ASH_SHELL_H_ 706 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_tooltip_manager.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698