diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 23:20:23 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 23:20:23 +0000 |
| commit | ab714ec7b7607024b5f3daca855a479191ca7986 (patch) | |
| tree | 6e25a1f58b992c9ba1b2961f9a61a6b99ab8c6a0 /chrome/browser/chrome_browser_main_linux.cc | |
| parent | 1c345d27878fdf8238e9abf3c238fa43aa8d374e (diff) | |
| download | chromium_src-ab714ec7b7607024b5f3daca855a479191ca7986.zip chromium_src-ab714ec7b7607024b5f3daca855a479191ca7986.tar.gz chromium_src-ab714ec7b7607024b5f3daca855a479191ca7986.tar.bz2 | |
Media Gallery: Move MediaDeviceNotificationsLinux from content to chrome.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10069007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132087 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main_linux.cc')
| -rw-r--r-- | chrome/browser/chrome_browser_main_linux.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/chrome_browser_main_linux.cc b/chrome/browser/chrome_browser_main_linux.cc index 1354ffb..c28daa4 100644 --- a/chrome/browser/chrome_browser_main_linux.cc +++ b/chrome/browser/chrome_browser_main_linux.cc @@ -4,6 +4,8 @@ #include "chrome/browser/chrome_browser_main_linux.h" +#include "chrome/browser/media_gallery/media_device_notifications_linux.h" + #if defined(USE_LINUX_BREAKPAD) #include <stdlib.h> @@ -70,6 +72,9 @@ ChromeBrowserMainPartsLinux::ChromeBrowserMainPartsLinux( : ChromeBrowserMainPartsPosix(parameters) { } +ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLinux() { +} + void ChromeBrowserMainPartsLinux::PreProfileInit() { #if defined(USE_LINUX_BREAKPAD) // Needs to be called after we have chrome::DIR_USER_DATA and @@ -82,5 +87,10 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { InitCrashReporter(); #endif + const FilePath kDefaultMtabPath("/etc/mtab"); + media_device_notifications_linux_ = + new chrome::MediaDeviceNotificationsLinux(kDefaultMtabPath); + media_device_notifications_linux_->Init(); + ChromeBrowserMainPartsPosix::PreProfileInit(); } |