diff options
author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-29 22:13:49 +0000 |
---|---|---|
committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-29 22:13:49 +0000 |
commit | 09e2697ef6df777cca0ea81d119fec5dbc4ba47b (patch) | |
tree | e3f13c3e70da2fbd63da46217e26a3b1baabf8a5 /chrome/browser/chrome_browser_main_linux.cc | |
parent | 8b0d36bcc0d28ad56cde595b146da158331230d7 (diff) | |
download | chromium_src-09e2697ef6df777cca0ea81d119fec5dbc4ba47b.zip chromium_src-09e2697ef6df777cca0ea81d119fec5dbc4ba47b.tar.gz chromium_src-09e2697ef6df777cca0ea81d119fec5dbc4ba47b.tar.bz2 |
Revert 153980 - Make the Linux System Monitor implementation track all devices
Add a few new functions to support media gallery and rename based on the new names in SystemMonitor
BUG=144496
Review URL: https://chromiumcodereview.appspot.com/10882039
TBR=vandebo@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10893039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153991 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, 5 insertions, 5 deletions
diff --git a/chrome/browser/chrome_browser_main_linux.cc b/chrome/browser/chrome_browser_main_linux.cc index be3b048..ad21460 100644 --- a/chrome/browser/chrome_browser_main_linux.cc +++ b/chrome/browser/chrome_browser_main_linux.cc @@ -5,7 +5,7 @@ #include "chrome/browser/chrome_browser_main_linux.h" #if !defined(OS_CHROMEOS) -#include "chrome/browser/media_gallery/removable_device_notifications_linux.h" +#include "chrome/browser/media_gallery/media_device_notifications_linux.h" #endif #if defined(USE_LINUX_BREAKPAD) @@ -104,9 +104,9 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { #if !defined(OS_CHROMEOS) const FilePath kDefaultMtabPath("/etc/mtab"); - removable_device_notifications_linux_ = - new chrome::RemovableDeviceNotificationsLinux(kDefaultMtabPath); - removable_device_notifications_linux_->Init(); + media_device_notifications_linux_ = + new chrome::MediaDeviceNotificationsLinux(kDefaultMtabPath); + media_device_notifications_linux_->Init(); #endif ChromeBrowserMainPartsPosix::PreProfileInit(); @@ -117,7 +117,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() { // Release it now. Otherwise the FILE thread would be gone when we try to // release it in the dtor and Valgrind would report a leak on almost ever // single browser_test. - removable_device_notifications_linux_ = NULL; + media_device_notifications_linux_ = NULL; #endif ChromeBrowserMainPartsPosix::PostMainMessageLoopRun(); |