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

Side by Side Diff: ash/shell.h

Issue 2113023002: mash: Migrate MediaDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comment. 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/media_delegate.h ('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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 class GPUSupport; 103 class GPUSupport;
104 class HighContrastController; 104 class HighContrastController;
105 class KeyboardUMAEventFilter; 105 class KeyboardUMAEventFilter;
106 class LinkHandlerModelFactory; 106 class LinkHandlerModelFactory;
107 class LocaleNotificationController; 107 class LocaleNotificationController;
108 class LockStateController; 108 class LockStateController;
109 enum class LoginStatus; 109 enum class LoginStatus;
110 class MagnificationController; 110 class MagnificationController;
111 class MaximizeModeController; 111 class MaximizeModeController;
112 class MaximizeModeWindowManager; 112 class MaximizeModeWindowManager;
113 class MediaDelegate;
114 class MouseCursorEventFilter; 113 class MouseCursorEventFilter;
115 class MruWindowTracker; 114 class MruWindowTracker;
116 class NewWindowDelegate; 115 class NewWindowDelegate;
117 class OverlayEventFilter; 116 class OverlayEventFilter;
118 class PartialMagnificationController; 117 class PartialMagnificationController;
119 class PointerWatcherDelegate; 118 class PointerWatcherDelegate;
120 class PowerButtonController; 119 class PowerButtonController;
121 class PowerEventObserver; 120 class PowerEventObserver;
122 class ProjectingObserver; 121 class ProjectingObserver;
123 class ResizeShadowController; 122 class ResizeShadowController;
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 } 388 }
390 389
391 AccessibilityDelegate* accessibility_delegate() { 390 AccessibilityDelegate* accessibility_delegate() {
392 return accessibility_delegate_.get(); 391 return accessibility_delegate_.get();
393 } 392 }
394 393
395 NewWindowDelegate* new_window_delegate() { 394 NewWindowDelegate* new_window_delegate() {
396 return new_window_delegate_.get(); 395 return new_window_delegate_.get();
397 } 396 }
398 397
399 MediaDelegate* media_delegate() { return media_delegate_.get(); }
400
401 HighContrastController* high_contrast_controller() { 398 HighContrastController* high_contrast_controller() {
402 return high_contrast_controller_.get(); 399 return high_contrast_controller_.get();
403 } 400 }
404 401
405 MagnificationController* magnification_controller() { 402 MagnificationController* magnification_controller() {
406 return magnification_controller_.get(); 403 return magnification_controller_.get();
407 } 404 }
408 405
409 PartialMagnificationController* partial_magnification_controller() { 406 PartialMagnificationController* partial_magnification_controller() {
410 return partial_magnification_controller_.get(); 407 return partial_magnification_controller_.get();
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 608
612 std::vector<WindowAndBoundsPair> to_restore_; 609 std::vector<WindowAndBoundsPair> to_restore_;
613 610
614 std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_; 611 std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_;
615 std::unique_ptr<AcceleratorController> accelerator_controller_; 612 std::unique_ptr<AcceleratorController> accelerator_controller_;
616 std::unique_ptr<ShellDelegate> delegate_; 613 std::unique_ptr<ShellDelegate> delegate_;
617 std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_; 614 std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
618 std::unique_ptr<SessionStateDelegate> session_state_delegate_; 615 std::unique_ptr<SessionStateDelegate> session_state_delegate_;
619 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; 616 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
620 std::unique_ptr<NewWindowDelegate> new_window_delegate_; 617 std::unique_ptr<NewWindowDelegate> new_window_delegate_;
621 std::unique_ptr<MediaDelegate> media_delegate_;
622 std::unique_ptr<PointerWatcherDelegate> pointer_watcher_delegate_; 618 std::unique_ptr<PointerWatcherDelegate> pointer_watcher_delegate_;
623 std::unique_ptr<ShelfDelegate> shelf_delegate_; 619 std::unique_ptr<ShelfDelegate> shelf_delegate_;
624 std::unique_ptr<ShelfItemDelegateManager> shelf_item_delegate_manager_; 620 std::unique_ptr<ShelfItemDelegateManager> shelf_item_delegate_manager_;
625 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_; 621 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;
626 622
627 std::unique_ptr<ShelfModel> shelf_model_; 623 std::unique_ptr<ShelfModel> shelf_model_;
628 std::unique_ptr<WindowPositioner> window_positioner_; 624 std::unique_ptr<WindowPositioner> window_positioner_;
629 625
630 std::unique_ptr<DragDropController> drag_drop_controller_; 626 std::unique_ptr<DragDropController> drag_drop_controller_;
631 std::unique_ptr<ResizeShadowController> resize_shadow_controller_; 627 std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
732 base::SequencedWorkerPool* blocking_pool_; 728 base::SequencedWorkerPool* blocking_pool_;
733 729
734 bool in_mus_ = false; 730 bool in_mus_ = false;
735 731
736 DISALLOW_COPY_AND_ASSIGN(Shell); 732 DISALLOW_COPY_AND_ASSIGN(Shell);
737 }; 733 };
738 734
739 } // namespace ash 735 } // namespace ash
740 736
741 #endif // ASH_SHELL_H_ 737 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/media_delegate.h ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698