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

Unified 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, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/media_delegate.h ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 8aed464df31f2ceabfcf3586b011ddf0b009a971..e30da16f4d24e35e0abed47b86c3c3248e909c05 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -110,7 +110,6 @@ enum class LoginStatus;
class MagnificationController;
class MaximizeModeController;
class MaximizeModeWindowManager;
-class MediaDelegate;
class MouseCursorEventFilter;
class MruWindowTracker;
class NewWindowDelegate;
@@ -396,8 +395,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
return new_window_delegate_.get();
}
- MediaDelegate* media_delegate() { return media_delegate_.get(); }
-
HighContrastController* high_contrast_controller() {
return high_contrast_controller_.get();
}
@@ -618,7 +615,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
std::unique_ptr<SessionStateDelegate> session_state_delegate_;
std::unique_ptr<AccessibilityDelegate> accessibility_delegate_;
std::unique_ptr<NewWindowDelegate> new_window_delegate_;
- std::unique_ptr<MediaDelegate> media_delegate_;
std::unique_ptr<PointerWatcherDelegate> pointer_watcher_delegate_;
std::unique_ptr<ShelfDelegate> shelf_delegate_;
std::unique_ptr<ShelfItemDelegateManager> shelf_item_delegate_manager_;
« 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