device/capture/video/android/java/src/org/chromium/device/VideoCaptureCamera.java - Issue 2214533002: 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/java/src/org/chromium/device/VideoCaptureCamera.java

Issue 2214533002: move //media/capture to //device/capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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

« no previous file with comments | « device/capture/video/android/java/src/org/chromium/device/VideoCaptureAndroid.java ('k') | device/capture/video/android/java/src/org/chromium/device/VideoCaptureCamera2.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/capture/video/android/java/src/org/chromium/device/VideoCaptureCamera.java

diff --git a/media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera.java b/device/capture/video/android/java/src/org/chromium/device/VideoCaptureCamera.java

similarity index 99%

rename from media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera.java

rename to device/capture/video/android/java/src/org/chromium/device/VideoCaptureCamera.java

index 53607868696608f12fde692e6804415d119dcd2b..e20f9fddc4f854b46af83fb14346b8b607e40930 100644

--- a/media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera.java

+++ b/device/capture/video/android/java/src/org/chromium/device/VideoCaptureCamera.java

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

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

// found in the LICENSE file.

-package org.chromium.media;

+package org.chromium.device;

import android.annotation.TargetApi;

import android.content.Context;

@@ -22,7 +22,7 @@ import java.util.concurrent.locks.ReentrantLock;

* for capture using android.hardware.Camera API (deprecated in API 21). Normal

* Android and Tango devices are extensions of this class.

**/

-@JNINamespace("media")

+@JNINamespace("device")

@SuppressWarnings("deprecation")

// TODO: is this class only used on ICS MR1 (or some later version) and above?

@TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1)