summaryrefslogtreecommitdiffstats
path: root/content/browser/resource_context.h
diff options
context:
space:
mode:
authorscottfr@chromium.org <scottfr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-24 20:59:19 +0000
committerscottfr@chromium.org <scottfr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-24 20:59:19 +0000
commitcc87500b3429b8a31b2c60729be4248c3b562f85 (patch)
tree1dee38116713940b5482477073a0a86e8e49fc91 /content/browser/resource_context.h
parent161277d49b6d2c0d7eb1c0569fa4b6aad44b3b0e (diff)
downloadchromium_src-cc87500b3429b8a31b2c60729be4248c3b562f85.zip
chromium_src-cc87500b3429b8a31b2c60729be4248c3b562f85.tar.gz
chromium_src-cc87500b3429b8a31b2c60729be4248c3b562f85.tar.bz2
Add MediaInternals data aggregator.
BUG=none TEST=tests pass Review URL: http://codereview.chromium.org/7111061 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/resource_context.h')
-rw-r--r--content/browser/resource_context.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/content/browser/resource_context.h b/content/browser/resource_context.h
index 04ad849..57bad74 100644
--- a/content/browser/resource_context.h
+++ b/content/browser/resource_context.h
@@ -15,6 +15,7 @@ class ChromeAppCacheService;
class ChromeBlobStorageContext;
class ExtensionInfoMap;
class HostZoomMap;
+class MediaObserver;
namespace fileapi {
class FileSystemContext;
} // namespace fileapi
@@ -71,6 +72,9 @@ class ResourceContext {
HostZoomMap* host_zoom_map() const;
void set_host_zoom_map(HostZoomMap* host_zoom_map);
+ MediaObserver* media_observer() const;
+ void set_media_observer(MediaObserver* media_observer);
+
// =======================================================================
// TODO(willchan): These don't belong in content/. Remove them eventually.
@@ -93,6 +97,7 @@ class ResourceContext {
ChromeBlobStorageContext* blob_storage_context_;
quota::QuotaManager* quota_manager_;
HostZoomMap* host_zoom_map_;
+ MediaObserver* media_observer_;
// Externally-defined data accessible by key.
typedef std::map<const void*, void*> UserDataMap;