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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side 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, 6 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 unified diff | Download patch

« no previous file with comments | « media/capture/content/smooth_event_sampler.h ('k') | media/capture/video/android/video_capture_device_factory_android.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.

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

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_	5 #ifndef MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_

6 #define MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_	6 #define MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_

7	7

8 #include <jni.h>	8 #include <jni.h>

9 #include <string>	9 #include <string>

10	10

11 #include "base/android/scoped_java_ref.h"	11 #include "base/android/scoped_java_ref.h"

12 #include "base/macros.h"	12 #include "base/macros.h"

13 #include "base/synchronization/lock.h"	13 #include "base/synchronization/lock.h"

14 #include "base/threading/thread.h"	14 #include "base/threading/thread.h"

15 #include "base/time/time.h"	15 #include "base/time/time.h"

16 #include "media/base/media_export.h"	16 #include "media/base/media_export.h"

(...skipping 88 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
105 VideoCaptureFormat capture_format_;	105 VideoCaptureFormat capture_format_;

106	106

107 // Java VideoCaptureAndroid instance.	107 // Java VideoCaptureAndroid instance.

108 base::android::ScopedJavaLocalRef<jobject> j_capture_;	108 base::android::ScopedJavaLocalRef<jobject> j_capture_;

109	109

110 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceAndroid);	110 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceAndroid);

111 };	111 };

112	112

113 } // namespace media	113 } // namespace media

114	114

115 #endif // MEDIA_VIDEO_CAPTURE_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_	115 #endif // MEDIA_CAPTURE_VIDEO_ANDROID_VIDEO_CAPTURE_DEVICE_ANDROID_H_

OLD	NEW