Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2769)

Unified Diff: content/public/android/java/src/org/chromium/content_public/browser/ContentVideoView.java

Issue 141533006: [Android] Move the java content/ package to content_public/ to start the split. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Small fixes and findbugs line update Created 6 years, 11 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
Index: content/public/android/java/src/org/chromium/content_public/browser/ContentVideoView.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java b/content/public/android/java/src/org/chromium/content_public/browser/ContentVideoView.java
similarity index 97%
rename from content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java
rename to content/public/android/java/src/org/chromium/content_public/browser/ContentVideoView.java
index a1c2f1492ec1b3c39295bfac80f6b53c224d5767..11e65c18f8357175e87e00ee441380b252be3089 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java
+++ b/content/public/android/java/src/org/chromium/content_public/browser/ContentVideoView.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.content.browser;
+package org.chromium.content_public.browser;
import android.app.Activity;
import android.app.AlertDialog;
@@ -24,6 +24,7 @@ import android.widget.TextView;
import org.chromium.base.CalledByNative;
import org.chromium.base.JNINamespace;
import org.chromium.base.ThreadUtils;
+import org.chromium.content_public.R;
/**
* This class implements accelerated fullscreen video playback using surface view.
@@ -147,15 +148,15 @@ public class ContentVideoView extends FrameLayout implements SurfaceHolder.Callb
private void initResources(Context context) {
if (mPlaybackErrorText != null) return;
mPlaybackErrorText = context.getString(
- org.chromium.content.R.string.media_player_error_text_invalid_progressive_playback);
+ R.string.media_player_error_text_invalid_progressive_playback);
mUnknownErrorText = context.getString(
- org.chromium.content.R.string.media_player_error_text_unknown);
+ R.string.media_player_error_text_unknown);
mErrorButton = context.getString(
- org.chromium.content.R.string.media_player_error_button);
+ R.string.media_player_error_button);
mErrorTitle = context.getString(
- org.chromium.content.R.string.media_player_error_title);
+ R.string.media_player_error_title);
mVideoLoadingText = context.getString(
- org.chromium.content.R.string.media_player_loading_video);
+ R.string.media_player_loading_video);
}
protected void showContentVideoView() {

Powered by Google App Engine
This is Rietveld 408576698