content/browser/browser_main_loop.cc - Issue 12374068: Make it possible to disable udev in linux

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: unbreak mac 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:

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..2857fe930f6d637b120adcfe1476cdcb317a0540 100644

--- a/content/browser/browser_main_loop.cc

+++ b/content/browser/browser_main_loop.cc

@@ -90,8 +90,8 @@

#include <glib-object.h>

#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

@@ -960,7 +960,7 @@ int BrowserMainLoop::BrowserThreadsStarted() {

#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());

« no previous file with comments | « content/browser/browser_main_loop.h ('k') | content/browser/device_monitor_linux.h » ('j') | no next file with comments »