webrtc/modules/video_capture/android/device_info_android.cc - Issue 1291283003: Include webrtc/base/json.h rather than from jsoncpp directly.

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: webrtc/modules/video_capture/android/device_info_android.cc

Issue 1291283003: Include webrtc/base/json.h rather than from jsoncpp directly. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master

Patch Set: Just including base json Created 5 years, 4 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: webrtc/modules/video_capture/android/device_info_android.cc

diff --git a/webrtc/modules/video_capture/android/device_info_android.cc b/webrtc/modules/video_capture/android/device_info_android.cc

index 02075d5e194e12c95d235068805a2e817184717f..974717c4b77377d40f53eb9ad7643ac7ccdd7897 100644

--- a/webrtc/modules/video_capture/android/device_info_android.cc

+++ b/webrtc/modules/video_capture/android/device_info_android.cc

@@ -14,8 +14,8 @@

#include <sstream>

#include <vector>

-#include "json/json.h"

#include "unicode/unistr.h"

+#include "webrtc/base/json.h"

#include "webrtc/modules/video_capture/android/video_capture_android.h"

#include "webrtc/system_wrappers/interface/logging.h"

#include "webrtc/system_wrappers/interface/ref_count.h"

« no previous file with comments | « no previous file | no next file » | no next file with comments »