content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java - Issue 11360207: Add Java resources to content and chrome.

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: content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java

Issue 11360207: Add Java resources to content and chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remove obsolete findbugs warnings Created 8 years, 1 month 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 | « content/public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java ('k') | content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/java/src/org/chromium/content/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/browser/ContentVideoView.java

index 665b401bbeeb0128f276a4ee527c66c7214f975e..b5f67ead74e6cd461c219ac084af5c0ffd9fddf5 100644

--- a/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java

+++ b/content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java

@@ -33,8 +33,8 @@ import java.lang.ref.WeakReference;

import org.chromium.base.CalledByNative;

import org.chromium.base.JNINamespace;

-import org.chromium.content.app.AppResource;

import org.chromium.content.common.ISandboxedProcessService;

+import org.chromium.content.R;

@JNINamespace("content")

public class ContentVideoView extends FrameLayout implements MediaPlayerControl,

@@ -201,12 +201,12 @@ public class ContentVideoView extends FrameLayout implements MediaPlayerControl,

if (mPlaybackErrorText != null) return;

mPlaybackErrorText = context.getString(

- AppResource.STRING_MEDIA_PLAYER_MESSAGE_PLAYBACK_ERROR);

+ R.string.media_player_error_text_invalid_progressive_playback);

mUnknownErrorText = context.getString(

- AppResource.STRING_MEDIA_PLAYER_MESSAGE_UNKNOWN_ERROR);

- mErrorButton = context.getString(AppResource.STRING_MEDIA_PLAYER_ERROR_BUTTON);

- mErrorTitle = context.getString(AppResource.STRING_MEDIA_PLAYER_ERROR_TITLE);

- mVideoLoadingText = context.getString(AppResource.STRING_MEDIA_PLAYER_LOADING_VIDEO);

+ R.string.media_player_error_text_unknown);

+ mErrorButton = context.getString(R.string.media_player_error_button);

+ mErrorTitle = context.getString(R.string.media_player_error_title);

+ mVideoLoadingText = context.getString(R.string.media_player_loading_video);

}

void showContentVideoView() {