Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1789)

Unified Diff: content/browser/renderer_host/media/audio_renderer_host.h

Issue 9845033: Move the MediaObserver getter from ResourceContext to ContentBrowserClient, since we only need to s… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix dcheck Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/media/audio_renderer_host.h
===================================================================
--- content/browser/renderer_host/media/audio_renderer_host.h (revision 128803)
+++ content/browser/renderer_host/media/audio_renderer_host.h (working copy)
@@ -89,8 +89,8 @@
typedef std::map<int, AudioEntry*> AudioEntryMap;
// Called from UI thread from the owner of this object.
- AudioRendererHost(content::ResourceContext* resource_context,
- AudioManager* audio_manager);
+ AudioRendererHost(AudioManager* audio_manager,
+ content::MediaObserver* media_observer);
// content::BrowserMessageFilter implementation.
virtual void OnChannelClosing() OVERRIDE;
@@ -178,14 +178,11 @@
// event is received.
AudioEntry* LookupByController(media::AudioOutputController* controller);
- // Returns the MediaObserver from |resource_context_| or NULL if none exists.
- content::MediaObserver* GetMediaObserver();
-
// A map of stream IDs to audio sources.
AudioEntryMap audio_entries_;
- content::ResourceContext* resource_context_;
AudioManager* audio_manager_;
+ content::MediaObserver* media_observer_;
DISALLOW_COPY_AND_ASSIGN(AudioRendererHost);
};
« no previous file with comments | « content/browser/mock_content_browser_client.cc ('k') | content/browser/renderer_host/media/audio_renderer_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698