From 49513e078c82d7cc8a7805297254a04d647759e6 Mon Sep 17 00:00:00 2001 From: "mostynb@opera.com" Date: Wed, 20 Nov 2013 08:36:40 +0000 Subject: Make it possible to disable udev in the content API on linux This is useful for embedded linux setups, which often don't include udev support. TEST=Build content_shell on linux with use_udev=0 then run ldd on output binaries to verify libudev is not listed (and is listed if built with use_udev=1 or unspecified) BUG=318315,318413 Review URL: https://codereview.chromium.org/12374068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236204 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/browser_main_loop.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'content/browser/browser_main_loop.cc') diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index 7b7a529..89f30216 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -91,8 +91,8 @@ #include #endif -#if defined(OS_LINUX) -#include "content/browser/device_monitor_linux.h" +#if defined(OS_LINUX) && defined(USE_UDEV) +#include "content/browser/device_monitor_udev.h" #elif defined(OS_MACOSX) && !defined(OS_IOS) #include "content/browser/device_monitor_mac.h" #endif @@ -959,7 +959,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()); -- cgit v1.1