diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-25 01:00:54 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-25 01:00:54 +0000 |
| commit | e5e2de42502bdb68b9a4eb61c3d3d28bbcb1b5cb (patch) | |
| tree | b66c403cd80c5754f07be256791511d24231b76c /content/public/browser/resource_context.h | |
| parent | 78caa9e65724fa68ad6d54e8f9ecef7078bc2c0f (diff) | |
| download | chromium_src-e5e2de42502bdb68b9a4eb61c3d3d28bbcb1b5cb.zip chromium_src-e5e2de42502bdb68b9a4eb61c3d3d28bbcb1b5cb.tar.gz chromium_src-e5e2de42502bdb68b9a4eb61c3d3d28bbcb1b5cb.tar.bz2 | |
Revert 128789 - Media failures on Win/Mac/Linux starting with this CL.
Move the MediaObserver getter from ResourceContext to ContentBrowserClient, since we only need to support one.
BUG=98716
Review URL: https://chromiumcodereview.appspot.com/9845033
TBR=jam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9808107
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128797 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public/browser/resource_context.h')
| -rw-r--r-- | content/public/browser/resource_context.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/content/public/browser/resource_context.h b/content/public/browser/resource_context.h index e52cdeb..817578f 100644 --- a/content/public/browser/resource_context.h +++ b/content/public/browser/resource_context.h @@ -19,6 +19,8 @@ class URLRequestContext; namespace content { +class MediaObserver; + // ResourceContext contains the relevant context information required for // resource loading. It lives on the IO thread, although it is constructed on // the UI thread. @@ -30,6 +32,7 @@ class CONTENT_EXPORT ResourceContext : public base::SupportsUserData { virtual ~ResourceContext() {} virtual net::HostResolver* GetHostResolver() = 0; virtual net::URLRequestContext* GetRequestContext() = 0; + virtual MediaObserver* GetMediaObserver() = 0; }; } // namespace content |