summaryrefslogtreecommitdiffstats
path: root/ash/shell.h
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-01 11:43:07 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-01 11:43:07 +0000
commitefc897f7d4133bc9e119d29a2878375abc07e4fd (patch)
treef4a4490a6b65a1de02eec6697bca1e6d6ceefd97 /ash/shell.h
parentb6bd5916a34b1694acd55e53be84601747b9731e (diff)
downloadchromium_src-efc897f7d4133bc9e119d29a2878375abc07e4fd.zip
chromium_src-efc897f7d4133bc9e119d29a2878375abc07e4fd.tar.gz
chromium_src-efc897f7d4133bc9e119d29a2878375abc07e4fd.tar.bz2
Introduce MediaDelegate
BUG=none Review URL: https://codereview.chromium.org/48523010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232330 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
-rw-r--r--ash/shell.h6
1 files changed, 6 insertions, 0 deletions
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 LauncherItemDelegateManager;
class LauncherModel;
class LockStateController;
class MagnificationController;
+class MediaDelegate;
class MruWindowTracker;
class NestedDispatcherController;
class NewWindowDelegate;
@@ -377,6 +378,10 @@ class ASH_EXPORT Shell
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 @@ class ASH_EXPORT Shell
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_;