diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 02:20:13 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 02:20:13 +0000 |
| commit | 4b59a4240d02d872cb94b529cc38cee34360a5dd (patch) | |
| tree | 45cea3ce45d3571c60d5b6e87f8214e105664ae0 /content/browser/browser_main_loop.cc | |
| parent | f160e2fef08c9e12336efb14834ec36ce7d2a685 (diff) | |
| download | chromium_src-4b59a4240d02d872cb94b529cc38cee34360a5dd.zip chromium_src-4b59a4240d02d872cb94b529cc38cee34360a5dd.tar.gz chromium_src-4b59a4240d02d872cb94b529cc38cee34360a5dd.tar.bz2 | |
Revert 124288 (made mac browser and ui_tests flaky) - Add Media device notification to SystemMonitor and Mac impl
BUG=110400
TEST=run chrome with -v=1, attach and a mass storage media device and observe the log entries for the attach and detach events.
Review URL: https://chromiumcodereview.appspot.com/9363008
TBR=vandebo@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9555014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124335 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_main_loop.cc')
| -rw-r--r-- | content/browser/browser_main_loop.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index 430e76f..af21209 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -53,10 +53,6 @@ #include "net/base/winsock_init.h" #endif -#if defined(OS_MACOSX) -#include "content/browser/mac/media_device_notifications.h" -#endif - #if defined(OS_LINUX) || defined(OS_OPENBSD) #include <glib-object.h> #endif @@ -331,8 +327,6 @@ void BrowserMainLoop::MainMessageLoopStart() { #if defined(OS_WIN) system_message_window_.reset(new SystemMessageWindowWin); -#elif defined(OS_MACOSX) - StartMediaDeviceNotifications(); #endif // Prior to any processing happening on the io thread, we create the |