device/capture/video/android/video_capture_device_factory_android.cc - Issue 2143903003: [WIP] Move media/capture to device/capture

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: device/capture/video/android/video_capture_device_factory_android.cc

Issue 2143903003: [WIP] Move media/capture to device/capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 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 | « device/capture/video/android/video_capture_device_factory_android.h ('k') | device/capture/video/fake_video_capture_device.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/capture/video/android/video_capture_device_factory_android.cc

diff --git a/media/capture/video/android/video_capture_device_factory_android.cc b/device/capture/video/android/video_capture_device_factory_android.cc

similarity index 97%

rename from media/capture/video/android/video_capture_device_factory_android.cc

rename to device/capture/video/android/video_capture_device_factory_android.cc

index 6b04cdc8bd766e87bdd80758c9e7803eae92b599..ee0522dab77544702b6ca7446332c734cd713287 100644

--- a/media/capture/video/android/video_capture_device_factory_android.cc

+++ b/device/capture/video/android/video_capture_device_factory_android.cc

@@ -2,7 +2,7 @@

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

// found in the LICENSE file.

-#include "media/capture/video/android/video_capture_device_factory_android.h"

+#include "device/capture/video/android/video_capture_device_factory_android.h"

#include <utility>

@@ -10,8 +10,8 @@

#include "base/android/jni_string.h"

#include "base/strings/string_number_conversions.h"

#include "base/strings/stringprintf.h"

+#include "device/capture/video/android/video_capture_device_android.h"

#include "jni/VideoCaptureFactory_jni.h"

-#include "media/capture/video/android/video_capture_device_android.h"

using base::android::AttachCurrentThread;

using base::android::ScopedJavaLocalRef;