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

Side by Side Diff: ash/shell.h

Issue 48523010: [Refactor] Introduce MediaDelegate (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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 | Annotate | Revision Log
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 <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 class DisplayController; 85 class DisplayController;
86 class FirstRunHelper; 86 class FirstRunHelper;
87 class HighContrastController; 87 class HighContrastController;
88 class Launcher; 88 class Launcher;
89 class LauncherDelegate; 89 class LauncherDelegate;
90 class LauncherItemDelegate; 90 class LauncherItemDelegate;
91 class LauncherItemDelegateManager; 91 class LauncherItemDelegateManager;
92 class LauncherModel; 92 class LauncherModel;
93 class LockStateController; 93 class LockStateController;
94 class MagnificationController; 94 class MagnificationController;
95 class MediaDelegate;
95 class MruWindowTracker; 96 class MruWindowTracker;
96 class NestedDispatcherController; 97 class NestedDispatcherController;
97 class NewWindowDelegate; 98 class NewWindowDelegate;
98 class PartialMagnificationController; 99 class PartialMagnificationController;
99 class PowerButtonController; 100 class PowerButtonController;
100 class RootWindowHostFactory; 101 class RootWindowHostFactory;
101 class ScreenAsh; 102 class ScreenAsh;
102 class SessionStateDelegate; 103 class SessionStateDelegate;
103 class ShellDelegate; 104 class ShellDelegate;
104 class ShellObserver; 105 class ShellObserver;
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 } 371 }
371 372
372 AccessibilityDelegate* accessibility_delegate() { 373 AccessibilityDelegate* accessibility_delegate() {
373 return accessibility_delegate_.get(); 374 return accessibility_delegate_.get();
374 } 375 }
375 376
376 NewWindowDelegate* new_window_delegate() { 377 NewWindowDelegate* new_window_delegate() {
377 return new_window_delegate_.get(); 378 return new_window_delegate_.get();
378 } 379 }
379 380
381 MediaDelegate* media_delegate() {
382 return media_delegate_.get();
383 }
384
380 HighContrastController* high_contrast_controller() { 385 HighContrastController* high_contrast_controller() {
381 return high_contrast_controller_.get(); 386 return high_contrast_controller_.get();
382 } 387 }
383 388
384 MagnificationController* magnification_controller() { 389 MagnificationController* magnification_controller() {
385 return magnification_controller_.get(); 390 return magnification_controller_.get();
386 } 391 }
387 392
388 PartialMagnificationController* partial_magnification_controller() { 393 PartialMagnificationController* partial_magnification_controller() {
389 return partial_magnification_controller_.get(); 394 return partial_magnification_controller_.get();
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
579 scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_; 584 scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_;
580 scoped_ptr<AcceleratorController> accelerator_controller_; 585 scoped_ptr<AcceleratorController> accelerator_controller_;
581 scoped_ptr<ShellDelegate> delegate_; 586 scoped_ptr<ShellDelegate> delegate_;
582 scoped_ptr<SystemTrayDelegate> system_tray_delegate_; 587 scoped_ptr<SystemTrayDelegate> system_tray_delegate_;
583 scoped_ptr<SystemTrayNotifier> system_tray_notifier_; 588 scoped_ptr<SystemTrayNotifier> system_tray_notifier_;
584 scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_; 589 scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
585 scoped_ptr<CapsLockDelegate> caps_lock_delegate_; 590 scoped_ptr<CapsLockDelegate> caps_lock_delegate_;
586 scoped_ptr<SessionStateDelegate> session_state_delegate_; 591 scoped_ptr<SessionStateDelegate> session_state_delegate_;
587 scoped_ptr<AccessibilityDelegate> accessibility_delegate_; 592 scoped_ptr<AccessibilityDelegate> accessibility_delegate_;
588 scoped_ptr<NewWindowDelegate> new_window_delegate_; 593 scoped_ptr<NewWindowDelegate> new_window_delegate_;
594 scoped_ptr<MediaDelegate> media_delegate_;
589 scoped_ptr<LauncherDelegate> launcher_delegate_; 595 scoped_ptr<LauncherDelegate> launcher_delegate_;
590 scoped_ptr<LauncherItemDelegateManager> launcher_item_delegate_manager_; 596 scoped_ptr<LauncherItemDelegateManager> launcher_item_delegate_manager_;
591 597
592 scoped_ptr<LauncherModel> launcher_model_; 598 scoped_ptr<LauncherModel> launcher_model_;
593 scoped_ptr<ash::WindowPositioner> window_positioner_; 599 scoped_ptr<ash::WindowPositioner> window_positioner_;
594 600
595 scoped_ptr<internal::AppListController> app_list_controller_; 601 scoped_ptr<internal::AppListController> app_list_controller_;
596 602
597 scoped_ptr<internal::DragDropController> drag_drop_controller_; 603 scoped_ptr<internal::DragDropController> drag_drop_controller_;
598 scoped_ptr<internal::ResizeShadowController> resize_shadow_controller_; 604 scoped_ptr<internal::ResizeShadowController> resize_shadow_controller_;
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
685 bool simulate_modal_window_open_for_testing_; 691 bool simulate_modal_window_open_for_testing_;
686 692
687 bool is_touch_hud_projection_enabled_; 693 bool is_touch_hud_projection_enabled_;
688 694
689 DISALLOW_COPY_AND_ASSIGN(Shell); 695 DISALLOW_COPY_AND_ASSIGN(Shell);
690 }; 696 };
691 697
692 } // namespace ash 698 } // namespace ash
693 699
694 #endif // ASH_SHELL_H_ 700 #endif // ASH_SHELL_H_
OLDNEW
« ash/media_delegate.h ('K') | « ash/media_delegate.h ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698