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 /chrome/browser/io_thread.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 'chrome/browser/io_thread.h')
| -rw-r--r-- | chrome/browser/io_thread.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h index 2cffacf..d651faa 100644 --- a/chrome/browser/io_thread.h +++ b/chrome/browser/io_thread.h @@ -21,6 +21,7 @@ class ChromeNetLog; class ExtensionEventRouterForwarder; +class MediaInternals; class PrefProxyConfigTrackerImpl; class PrefService; class SystemURLRequestContextGetter; @@ -57,6 +58,13 @@ class IOThread : public content::BrowserThreadDelegate { Globals(); ~Globals(); + struct MediaGlobals { + MediaGlobals(); + ~MediaGlobals(); + // MediaInternals singleton used to aggregate media information. + scoped_ptr<MediaInternals> media_internals; + } media; + // The "system" NetworkDelegate, used for Profile-agnostic network events. scoped_ptr<net::NetworkDelegate> system_network_delegate; scoped_ptr<net::HostResolver> host_resolver; |