content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java - Issue 11087082: Adding progresss bar when loading fullscreen video

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/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java

Issue 11087082: Adding progresss bar when loading fullscreen video (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: resolve some previous merge conflicts Created 8 years, 2 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 | « content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java ('k') | content/shell/android/res/values/strings.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java

diff --git a/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java b/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java

index 64f03473ff35b0be6bca91b2a7ada6817b4a3210..c5212874d053bd8b76cb757d7f417de5dd760117 100644

--- a/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java

+++ b/content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java

@@ -13,6 +13,7 @@ import android.view.KeyEvent;

import org.chromium.content.app.AppResource;

import org.chromium.content.app.LibraryLoader;

+import org.chromium.content.browser.ContentVideoView;

import org.chromium.content.browser.ContentView;

import org.chromium.content.common.CommandLine;

import org.chromium.ui.gfx.ActivityNativeWindow;

@@ -54,6 +55,7 @@ public class ContentShellActivity extends Activity {

mActivityNativeWindow = new ActivityNativeWindow(this);

mActivityNativeWindow.restoreInstanceState(savedInstanceState);

mShellManager.setWindow(mActivityNativeWindow);

+ ContentVideoView.registerChromeActivity(this);

String startupUrl = getUrlFromIntent(getIntent());

if (!TextUtils.isEmpty(startupUrl)) {

@@ -185,5 +187,6 @@ public class ContentShellActivity extends Activity {

R.string.media_player_error_text_unknown;

AppResource.STRING_MEDIA_PLAYER_ERROR_BUTTON = R.string.media_player_error_button;

AppResource.STRING_MEDIA_PLAYER_ERROR_TITLE = R.string.media_player_error_title;

+ AppResource.STRING_MEDIA_PLAYER_LOADING_VIDEO = R.string.media_player_loading_video;

}