summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chrome_browser_main_linux.h
diff options
context:
space:
mode:
authorvandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-29 22:13:49 +0000
committervandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-29 22:13:49 +0000
commit09e2697ef6df777cca0ea81d119fec5dbc4ba47b (patch)
treee3f13c3e70da2fbd63da46217e26a3b1baabf8a5 /chrome/browser/chrome_browser_main_linux.h
parent8b0d36bcc0d28ad56cde595b146da158331230d7 (diff)
downloadchromium_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.h')
-rw-r--r--chrome/browser/chrome_browser_main_linux.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/chrome_browser_main_linux.h b/chrome/browser/chrome_browser_main_linux.h
index b968086..b1d1521 100644
--- a/chrome/browser/chrome_browser_main_linux.h
+++ b/chrome/browser/chrome_browser_main_linux.h
@@ -18,7 +18,7 @@
#if !defined(OS_CHROMEOS)
namespace chrome {
-class RemovableDeviceNotificationsLinux;
+class MediaDeviceNotificationsLinux;
}
#endif
@@ -34,8 +34,8 @@ class ChromeBrowserMainPartsLinux : public ChromeBrowserMainPartsPosix {
private:
#if !defined(OS_CHROMEOS)
- scoped_refptr<chrome::RemovableDeviceNotificationsLinux>
- removable_device_notifications_linux_;
+ scoped_refptr<chrome::MediaDeviceNotificationsLinux>
+ media_device_notifications_linux_;
#endif
#if defined(OS_CHROMEOS)