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

Unified Diff: chrome/browser/browser_process_impl.cc

Issue 10332190: Add SystemMonitor::GetMediaDevices() (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix win Created 8 years, 7 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: chrome/browser/browser_process_impl.cc
===================================================================
--- chrome/browser/browser_process_impl.cc (revision 137377)
+++ chrome/browser/browser_process_impl.cc (working copy)
@@ -34,6 +34,7 @@
#include "chrome/browser/icon_manager.h"
#include "chrome/browser/intranet_redirect_detector.h"
#include "chrome/browser/io_thread.h"
+#include "chrome/browser/media_gallery/media_device_manager.h"
#include "chrome/browser/metrics/metrics_service.h"
#include "chrome/browser/metrics/thread_watcher.h"
#include "chrome/browser/net/chrome_net_log.h"
@@ -651,6 +652,10 @@
#endif
}
+chrome::MediaDeviceManager* BrowserProcessImpl::media_device_manager() {
+ return media_device_manager_.get();
+}
+
void BrowserProcessImpl::ResourceDispatcherHostCreated() {
resource_dispatcher_host_delegate_.reset(
new ChromeResourceDispatcherHostDelegate(prerender_tracker()));
@@ -778,6 +783,8 @@
if (local_state_->IsManagedPreference(prefs::kDefaultBrowserSettingEnabled))
ApplyDefaultBrowserPolicy();
+
+ media_device_manager_.reset(new chrome::MediaDeviceManager());
}
void BrowserProcessImpl::CreateIconManager() {

Powered by Google App Engine
This is Rietveld 408576698