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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/browser_main_loop.cc

Issue 12374068: Make it possible to disable udev in linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix jam's nits Created 7 years, 1 month 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
« content/browser/browser_main_loop.h ('K') | « content/browser/browser_main_loop.h ('k') | content/browser/device_monitor_linux.h » ('j') | content/browser/device_monitor_linux.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 3addee33ee6aec88ac6cc611dc0e7d5bd86b05d1..3b6f2596bf3129be1590a497d3b7da434910fa31 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -90,7 +90,7 @@
#include <glib-object.h>
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && defined(USE_UDEV)
#include "content/browser/device_monitor_linux.h"
#elif defined(OS_MACOSX) && !defined(OS_IOS)
#include "content/browser/device_monitor_mac.h"
@@ -960,7 +960,7 @@ int BrowserMainLoop::BrowserThreadsStarted() {
#endif
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && defined(USE_UDEV)
device_monitor_linux_.reset(new DeviceMonitorLinux());
#elif defined(OS_MACOSX)
device_monitor_mac_.reset(new DeviceMonitorMac());
« content/browser/browser_main_loop.h ('K') | « content/browser/browser_main_loop.h ('k') | content/browser/device_monitor_linux.h » ('j') | content/browser/device_monitor_linux.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698