Commit 0bf3d71d authored by Peter E Conn's avatar Peter E Conn Committed by Chromium LUCI CQ

🍱 Remove ChromeActivity dependence from PictureInPictureController.

Change-Id: I4bbba28ef64ee3c1b989f43a0878d3f14bd33dfe
Bug: 1155373
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2580883Reviewed-by: default avatarBrandon Wylie <wylieb@chromium.org>
Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Commit-Queue: Peter Conn <peconn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835629}
parent a9b0a2bc
...@@ -213,9 +213,6 @@ specific_include_rules = { ...@@ -213,9 +213,6 @@ specific_include_rules = {
"LanguageAskPrompt\.java": [ "LanguageAskPrompt\.java": [
"+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java", "+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java",
], ],
"PictureInPictureController\.java": [
"+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java",
],
"ChromeTabModalPresenter\.java": [ "ChromeTabModalPresenter\.java": [
"+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java", "+chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java",
], ],
......
...@@ -939,7 +939,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent> ...@@ -939,7 +939,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
MultiWindowUtils.getInstance().isInMultiWindowMode(this)); MultiWindowUtils.getInstance().isInMultiWindowMode(this));
if (mPictureInPictureController != null) { if (mPictureInPictureController != null) {
mPictureInPictureController.cleanup(this); mPictureInPictureController.cleanup();
} }
VrModuleProvider.getDelegate().maybeRegisterVrEntryHook(this); VrModuleProvider.getDelegate().maybeRegisterVrEntryHook(this);
...@@ -954,9 +954,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent> ...@@ -954,9 +954,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
if (isActivityFinishingOrDestroyed()) return; if (isActivityFinishingOrDestroyed()) return;
if (mPictureInPictureController == null) { if (mPictureInPictureController == null) {
mPictureInPictureController = new PictureInPictureController(); mPictureInPictureController = new PictureInPictureController(
this, getActivityTabProvider(), getFullscreenManager());
} }
mPictureInPictureController.attemptPictureInPicture(this);
mPictureInPictureController.attemptPictureInPicture();
} }
@Override @Override
...@@ -1000,7 +1002,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent> ...@@ -1000,7 +1002,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@Override @Override
public void onNewIntentWithNative(Intent intent) { public void onNewIntentWithNative(Intent intent) {
if (mPictureInPictureController != null) { if (mPictureInPictureController != null) {
mPictureInPictureController.cleanup(this); mPictureInPictureController.cleanup();
} }
super.onNewIntentWithNative(intent); super.onNewIntentWithNative(intent);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment