talk/media/devices/fakedevicemanager.h - Issue 1588453005: Eliminate defines in talk/

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: talk/media/devices/fakedevicemanager.h

Issue 1588453005: Eliminate defines in talk/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Excluding iOS from converted OSX defines Created 4 years, 11 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:

Index: talk/media/devices/fakedevicemanager.h

diff --git a/talk/media/devices/fakedevicemanager.h b/talk/media/devices/fakedevicemanager.h

index a4b2b86e443f0155ff1af97a66d5a3e43077c64a..77a83424b2f12ba063369953586d02c7fbe6fe04 100644

--- a/talk/media/devices/fakedevicemanager.h

+++ b/talk/media/devices/fakedevicemanager.h

@@ -156,7 +156,7 @@ class FakeDeviceManager : public DeviceManagerInterface {

return true;

}

-#ifdef OSX

+#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)

bool QtKitToSgDevice(const std::string& qtkit_name, Device* out) {

out->name = qtkit_name;

out->id = "sg:" + qtkit_name;

« no previous file with comments | « talk/media/devices/devicemanager_unittest.cc ('k') | talk/media/devices/v4llookup.h » ('j') | no next file with comments »