| 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() {
|
|
|