diff options
| author | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-15 21:31:38 +0000 |
|---|---|---|
| committer | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-15 21:31:38 +0000 |
| commit | 604f46939df8ec2d74dce354e6ae4f89b247292f (patch) | |
| tree | 4a619ee562e251cfbbc7b09c2032243eaddf50cf /content/shell | |
| parent | 0b056eeffc99ce86fd877396cc5489bf67f38f2c (diff) | |
| download | chromium_src-604f46939df8ec2d74dce354e6ae4f89b247292f.zip chromium_src-604f46939df8ec2d74dce354e6ae4f89b247292f.tar.gz chromium_src-604f46939df8ec2d74dce354e6ae4f89b247292f.tar.bz2 | |
Adding progresss bar when loading fullscreen video
BUG=147240
Review URL: https://chromiumcodereview.appspot.com/11087082
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161969 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
| -rw-r--r-- | content/shell/android/java/src/org/chromium/content_shell/ContentShellActivity.java | 3 | ||||
| -rw-r--r-- | content/shell/android/res/values/strings.xml | 1 |
2 files changed, 4 insertions, 0 deletions
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 96ff75d..c54b335 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.browser.DeviceUtils; import org.chromium.content.common.CommandLine; @@ -57,6 +58,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)) { @@ -188,5 +190,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; } } diff --git a/content/shell/android/res/values/strings.xml b/content/shell/android/res/values/strings.xml index 5e07215..a25a193 100644 --- a/content/shell/android/res/values/strings.xml +++ b/content/shell/android/res/values/strings.xml @@ -21,4 +21,5 @@ <string name="media_player_error_text_unknown"> Sorry, this video cannot be played.</string> <string name="media_player_error_button">OK</string> + <string name="media_player_loading_video">Loading video</string> </resources> |