media/capture/video/android/video_capture_device_android.h - Issue 2068763002: Re-Reland: Make media/capture gn and gyps produce components

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 2068763002: Re-Reland: Make media/capture gn and gyps produce components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Disable warning 4267 in Win capture.gyp (probs. lost in the previous relanding). Rebase 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « media/capture/video/android/capture_jni_registrar.h ('k') | media/capture/video/android/video_capture_device_factory_android.h » ('j') | media/capture/video/win/filter_base_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 8eede91baa89bd092d2236f114a9c9aa63c4dfc7..9de33bf8a0e7b61f92cbfcfe3935cd34d76961a8 100644

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

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

@@ -13,7 +13,7 @@

#include "base/synchronization/lock.h"

#include "base/threading/thread.h"

#include "base/time/time.h"

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

+#include "media/capture/capture_export.h"

#include "media/capture/video/video_capture_device.h"

namespace tracked_objects {

@@ -26,7 +26,7 @@ namespace media {

// by VideoCaptureManager on its own thread, while OnFrameAvailable is called

// on JAVA thread (i.e., UI thread). Both will access |state_| and |client_|,

// but only VideoCaptureManager would change their value.

-class MEDIA_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice {

+class CAPTURE_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice {

public:

// Automatically generated enum to interface with Java world.