Merge from Chromium at DEPS revision 232870
This commit was generated by merge_to_master.py.
Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
diff --git a/ash/shell.h b/ash/shell.h
index 62379ac..fa54faa 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -92,6 +92,7 @@
class LauncherModel;
class LockStateController;
class MagnificationController;
+class MediaDelegate;
class MruWindowTracker;
class NestedDispatcherController;
class NewWindowDelegate;
@@ -377,6 +378,10 @@
return new_window_delegate_.get();
}
+ MediaDelegate* media_delegate() {
+ return media_delegate_.get();
+ }
+
HighContrastController* high_contrast_controller() {
return high_contrast_controller_.get();
}
@@ -586,6 +591,7 @@
scoped_ptr<SessionStateDelegate> session_state_delegate_;
scoped_ptr<AccessibilityDelegate> accessibility_delegate_;
scoped_ptr<NewWindowDelegate> new_window_delegate_;
+ scoped_ptr<MediaDelegate> media_delegate_;
scoped_ptr<LauncherDelegate> launcher_delegate_;
scoped_ptr<LauncherItemDelegateManager> launcher_item_delegate_manager_;