| Index: content/browser/browser_main_loop.cc
|
| ===================================================================
|
| --- content/browser/browser_main_loop.cc (revision 124295)
|
| +++ content/browser/browser_main_loop.cc (working copy)
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "content/browser/browser_main_loop.h"
|
|
|
| +#include <string>
|
| +
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| #include "base/debug/trace_event.h"
|
| @@ -57,6 +59,10 @@
|
| #include "content/browser/mac/media_device_notifications.h"
|
| #endif
|
|
|
| +#if defined(OS_LINUX)
|
| +#include "content/browser/media_device_notifications_linux.h"
|
| +#endif
|
| +
|
| #if defined(OS_LINUX) || defined(OS_OPENBSD)
|
| #include <glib-object.h>
|
| #endif
|
| @@ -207,7 +213,7 @@
|
| return g_current_browser_main_loop->audio_manager_.get();
|
| }
|
|
|
| -// BrowserMainLoop construction / destructione =============================
|
| +// BrowserMainLoop construction / destruction =============================
|
|
|
| BrowserMainLoop::BrowserMainLoop(const content::MainFunctionParams& parameters)
|
| : parameters_(parameters),
|
| @@ -583,6 +589,17 @@
|
| void BrowserMainLoop::BrowserThreadsStarted() {
|
| // RDH needs the IO thread to be created.
|
| resource_dispatcher_host_.reset(new ResourceDispatcherHost());
|
| +
|
| +#if defined(OS_LINUX)
|
| + // MediaDeviceNotificationsLinux needs the File Thread.
|
| + const FilePath kDefaultMtabPath("/etc/mtab");
|
| + media_device_notifications_linux_ =
|
| + new MediaDeviceNotificationsLinux(kDefaultMtabPath);
|
| + BrowserThread::PostTask(
|
| + BrowserThread::FILE, FROM_HERE,
|
| + base::Bind(&MediaDeviceNotificationsLinux::InitOnFileThread,
|
| + media_device_notifications_linux_.get()));
|
| +#endif
|
| }
|
|
|
| void BrowserMainLoop::InitializeToolkit() {
|
|
|