Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1031)

Unified Diff: content/browser/browser_main_loop.cc

Issue 10829073: Add DeviceMonitorLinux in BrowserMainLoop. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/browser_main_loop.cc
===================================================================
--- content/browser/browser_main_loop.cc (revision 148913)
+++ content/browser/browser_main_loop.cc (working copy)
@@ -16,6 +16,7 @@
#include "base/string_number_conversions.h"
#include "base/threading/thread_restrictions.h"
#include "content/browser/browser_thread_impl.h"
+#include "content/browser/devices_monitor/devices_monitor.h"
#include "content/browser/download/download_file_manager.h"
#include "content/browser/download/save_file_manager.h"
#include "content/browser/gamepad/gamepad_service.h"
@@ -218,6 +219,11 @@
media_stream::MediaStreamManager* BrowserMainLoop::GetMediaStreamManager() {
return g_current_browser_main_loop->media_stream_manager_.get();
}
+
+// static
+content::DevicesMonitor* BrowserMainLoop::GetDevicesMonitor() {
+ return g_current_browser_main_loop->devices_monitor_.get();
+}
// BrowserMainLoop construction / destruction =============================
BrowserMainLoop::BrowserMainLoop(const content::MainFunctionParams& parameters)
@@ -344,6 +350,7 @@
#if defined(OS_WIN)
system_message_window_.reset(new SystemMessageWindowWin);
#endif
+ devices_monitor_.reset(DevicesMonitor::Create());
tommi (sloooow) - chröme 2012/07/30 11:07:03 inside an #else?
// Prior to any processing happening on the io thread, we create the
// plugin service as it is predominantly used from the io thread,

Powered by Google App Engine
This is Rietveld 408576698