media/capture/video/android/video_capture_device_android.h - Issue 2010793003: Clean up media header include guards

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: media/capture/video/android/video_capture_device_android.h

Issue 2010793003: Clean up media header include guards (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update references to the param traits guard Created 4 years, 7 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: media/capture/video/android/video_capture_device_android.h

diff --git a/media/capture/video/android/video_capture_device_android.h b/media/capture/video/android/video_capture_device_android.h

index 529acd07d1e2605c1acf2b8a3212c29e207230d4..ee444967988aa129991d0fdc637cdb4090e4cf98 100644

--- a/media/capture/video/android/video_capture_device_android.h

+++ b/media/capture/video/android/video_capture_device_android.h

@@ -2,8 +2,8 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#ifndef MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_

-#define MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_

+#ifndef MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_

+#define MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_

#include <jni.h>

#include <string>

@@ -112,4 +112,4 @@ class MEDIA_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice {

} // namespace media

-#endif // MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_

+#endif // MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_