Index: content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java |
diff --git a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java |
index f72d1fb3fd154e678d2762a230f104568e029331..897d63cb5cb2fed2412c42c93ee3d6b2720e56ac 100644 |
--- a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java |
+++ b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java |
@@ -16,10 +16,12 @@ import android.view.KeyEvent; |
import org.chromium.base.ChromiumActivity; |
import org.chromium.content.app.LibraryLoader; |
-import org.chromium.content.browser.ActivityContentVideoViewDelegate; |
+import org.chromium.content.browser.ActivityContentVideoViewClient; |
import org.chromium.content.browser.AndroidBrowserProcess; |
import org.chromium.content.browser.ContentVideoView; |
+import org.chromium.content.browser.ContentVideoViewClient; |
import org.chromium.content.browser.ContentView; |
+import org.chromium.content.browser.ContentViewClient; |
import org.chromium.content.browser.DeviceUtils; |
import org.chromium.content.browser.TracingIntentHandler; |
import org.chromium.content.common.CommandLine; |
@@ -70,8 +72,6 @@ public class ContentShellActivity extends ChromiumActivity { |
mActivityNativeWindow = new ActivityNativeWindow(this); |
mActivityNativeWindow.restoreInstanceState(savedInstanceState); |
mShellManager.setWindow(mActivityNativeWindow); |
- ContentVideoView.registerContentVideoViewContextDelegate( |
- new ActivityContentVideoViewDelegate(this)); |
String startupUrl = getUrlFromIntent(getIntent()); |
if (!TextUtils.isEmpty(startupUrl)) { |
@@ -85,6 +85,12 @@ public class ContentShellActivity extends ChromiumActivity { |
} |
mShellManager.launchShell(shellUrl); |
} |
+ getActiveContentView().setContentViewClient(new ContentViewClient() { |
+ @Override |
+ public ContentVideoViewClient getContentVideoViewClient() { |
+ return new ActivityContentVideoViewClient(ContentShellActivity.this); |
+ } |
+ }); |
} catch (ProcessInitException e) { |
Log.e(TAG, "ContentView initialization failed.", e); |
finish(); |