diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 07:34:51 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 07:34:51 +0000 |
| commit | e974ad29d8f31b1f86bb551dc99ad4e5e62b002c (patch) | |
| tree | 34e9228a7f99ef48303b07d6e95bd86db9994347 /content/browser/browser_main_loop.cc | |
| parent | 20ffd496a4258d22656be676286fc0dda228194d (diff) | |
| download | chromium_src-e974ad29d8f31b1f86bb551dc99ad4e5e62b002c.zip chromium_src-e974ad29d8f31b1f86bb551dc99ad4e5e62b002c.tar.gz chromium_src-e974ad29d8f31b1f86bb551dc99ad4e5e62b002c.tar.bz2 | |
Implement Linux media notifier.
BUG=110400
TEST=included.
Review URL: http://codereview.chromium.org/9560008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125361 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_main_loop.cc')
| -rw-r--r-- | content/browser/browser_main_loop.cc | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index ed0b6320..bb3bdff 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -54,6 +54,10 @@ #include "net/base/winsock_init.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 @@ -204,7 +208,7 @@ AudioManager* BrowserMainLoop::GetAudioManager() { return g_current_browser_main_loop->audio_manager_.get(); } -// BrowserMainLoop construction / destructione ============================= +// BrowserMainLoop construction / destruction ============================= BrowserMainLoop::BrowserMainLoop(const content::MainFunctionParams& parameters) : parameters_(parameters), @@ -587,6 +591,14 @@ void BrowserMainLoop::InitializeMainThread() { 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); + media_device_notifications_linux_->Init(); +#endif } void BrowserMainLoop::InitializeToolkit() { |