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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/browser_main_loop.cc

Issue 11339014: Move content\browser\renderer_host\media to content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 2 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
« no previous file with comments | « content/browser/browser_main_loop.h ('k') | content/browser/geolocation/gps_location_provider_linux.cc » ('j') | content/browser/renderer_host/media/media_stream_dispatcher_host.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.cc
===================================================================
--- content/browser/browser_main_loop.cc (revision 164646)
+++ content/browser/browser_main_loop.cc (working copy)
@@ -217,7 +217,7 @@
}
// static
-media_stream::MediaStreamManager* BrowserMainLoop::GetMediaStreamManager() {
+MediaStreamManager* BrowserMainLoop::GetMediaStreamManager() {
return g_current_browser_main_loop->media_stream_manager_.get();
}
// BrowserMainLoop construction / destruction =============================
@@ -342,8 +342,7 @@
}
online_state_observer_.reset(new BrowserOnlineStateObserver);
- media_stream_manager_.reset(
- new media_stream::MediaStreamManager(audio_manager_.get()));
+ media_stream_manager_.reset(new MediaStreamManager(audio_manager_.get()));
// Prior to any processing happening on the io thread, we create the
// plugin service as it is predominantly used from the io thread,
« no previous file with comments | « content/browser/browser_main_loop.h ('k') | content/browser/geolocation/gps_location_provider_linux.cc » ('j') | content/browser/renderer_host/media/media_stream_dispatcher_host.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698