add device notification to Mac

content/browser/browser_main_loop.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/browser_main_loop.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/hi_res_timer_manager.h"
@@ skipping 50 matching lines @@
 #include "ui/base/l10n/l10n_util_win.h"
 #include "net/base/winsock_init.h"
 #endif
 
 #if defined(OS_LINUX) || defined(OS_OPENBSD)
 #include <glib-object.h>
 #endif
 
 #if defined(OS_LINUX)
 #include "content/browser/device_monitor_linux.h"
+#elif defined(OS_MACOSX)
+#include "content/browser/device_monitor_mac.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include <dbus/dbus-glib.h>
 #endif
 
 #if defined(TOOLKIT_GTK)
 #include "ui/gfx/gtk_util.h"
 #endif
 
@@ skipping 417 matching lines @@
   if (resource_dispatcher_host_.get())
     resource_dispatcher_host_.get()->Shutdown();
 
 #if defined(USE_AURA)
   ImageTransportFactory::Terminate();
 #endif
   BrowserGpuChannelHostFactory::Terminate();
 
   GamepadService::GetInstance()->Terminate();
 
+  // The device monitors are using |system_monitor_| as dependency, so delete
+  // them before |system_monitor_| goes away.
+  // On Mac and windows, the monitor needs to be destroyed on the same thread
+  // as they were created. On Linux, the monitor will be deleted when IO thread
+  // goes away.
+#if defined(OS_WIN)
+  system_message_window_.reset();
+#elif defined(OS_MACOSX)
+  device_monitor_mac_.reset();
+#endif
+
   // Must be size_t so we can subtract from it.
   for (size_t thread_id = BrowserThread::ID_COUNT - 1;
        thread_id >= (BrowserThread::UI + 1);
        --thread_id) {
     // Find the thread object we want to stop. Looping over all valid
     // BrowserThread IDs and DCHECKing on a missing case in the switch
     // statement helps avoid a mismatch between this code and the
     // BrowserThread::ID enumeration.
     //
     // The destruction order is the reverse order of occurrence in the
@@ skipping 94 matching lines @@
 void BrowserMainLoop::BrowserThreadsStarted() {
   HistogramSynchronizer::GetInstance();
 
   content::BrowserGpuChannelHostFactory::Initialize();
 #if defined(USE_AURA)
   ImageTransportFactory::Initialize();
 #endif
 
 #if defined(OS_LINUX)
   device_monitor_linux_.reset(new DeviceMonitorLinux());
+#elif defined(OS_MACOSX)
+  device_monitor_mac_.reset(new DeviceMonitorMac());
 #endif
 
   // RDH needs the IO thread to be created.
   resource_dispatcher_host_.reset(new ResourceDispatcherHostImpl());
 
 #if defined(ENABLE_INPUT_SPEECH)
   speech_recognition_manager_.reset(new speech::SpeechRecognitionManagerImpl());
 #endif
 
   // Start the GpuDataManager before we set up the MessageLoops because
@@ skipping 49 matching lines @@
   DCHECK_EQ(MessageLoop::TYPE_UI, MessageLoop::current()->type());
   if (parameters_.ui_task)
     MessageLoopForUI::current()->PostTask(FROM_HERE, *parameters_.ui_task);
 
   base::RunLoop run_loop;
   run_loop.Run();
 #endif
 }
 
 }  // namespace content