Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4146)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/FullscreenWebContentsActivity.java

Issue 2849533004: Revert of 📺 Move fullscreen web content to a new Activity. (Closed)
Patch Set: Created 3 years, 8 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
Index: chrome/android/java/src/org/chromium/chrome/browser/FullscreenWebContentsActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/FullscreenWebContentsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/FullscreenWebContentsActivity.java
deleted file mode 100644
index 5cbe34bf40bb2e7d7ad2241fec384726e5d03f13..0000000000000000000000000000000000000000
--- a/chrome/android/java/src/org/chromium/chrome/browser/FullscreenWebContentsActivity.java
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser;
-
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.provider.Browser;
-
-import org.chromium.base.Log;
-import org.chromium.chrome.R;
-import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;
-import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.chrome.browser.tabmodel.AsyncTabParamsManager;
-import org.chromium.chrome.browser.tabmodel.TabReparentingParams;
-import org.chromium.chrome.browser.util.IntentUtils;
-import org.chromium.chrome.browser.webapps.FullScreenActivity;
-
-/**
- * An Activity used to display fullscreen WebContents.
- */
-public class FullscreenWebContentsActivity extends FullScreenActivity {
- private static final String TAG = "FullWebConActivity";
-
- @Override
- protected Tab createTab() {
- assert getIntent().hasExtra(IntentHandler.EXTRA_TAB_ID);
-
- int tabId = IntentUtils.safeGetIntExtra(
- getIntent(), IntentHandler.EXTRA_TAB_ID, Tab.INVALID_TAB_ID);
- TabReparentingParams params = (TabReparentingParams) AsyncTabParamsManager.remove(tabId);
-
- Tab tab = params.getTabToReparent();
- tab.attachAndFinishReparenting(this, createTabDelegateFactory(), params);
- return tab;
- }
-
- @Override
- protected int getControlContainerLayoutId() {
- // TODO(peconn): Determine if there's something more suitable to use here.
- return R.layout.webapp_control_container;
- }
-
- @Override
- protected ChromeFullscreenManager createFullscreenManager() {
- // Create a Fullscreen manager that won't change the Tab's fullscreen state when the
- // Activity ends - we handle leaving fullscreen ourselves.
- return new ChromeFullscreenManager(this, false, false);
- }
-
- @Override
- public boolean supportsFullscreenActivity() {
- return true;
- }
-
- public static void toggleFullscreenMode(final boolean enableFullscreen, final Tab tab) {
- if (tab.getFullscreenManager() == null) {
- Log.w(TAG, "Cannot toggle fullscreen, manager is null.");
- return;
- }
-
- if (tab.getFullscreenManager().getTab() == tab) {
- tab.getFullscreenManager().setTab(null);
- }
-
- Runnable setFullscreen = new Runnable() {
- @Override
- public void run() {
- // The Tab's FullscreenManager changes when it is moved.
- tab.getFullscreenManager().setTab(tab);
- tab.toggleFullscreenMode(enableFullscreen);
- }
- };
-
- Intent intent = new Intent();
- Activity activity = tab.getActivity();
-
- if (enableFullscreen) {
- // Send to the FullscreenWebContentsActivity.
- intent.setClass(tab.getActivity(), FullscreenWebContentsActivity.class);
-
- intent.putExtra(IntentHandler.EXTRA_PARENT_COMPONENT, activity.getComponentName());
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- // In multiwindow mode we want both activities to be able to launch independent
- // FullscreenWebContentsActivity's.
- intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
- } else {
- // Send back to the Activity it came from.
- ComponentName parent = IntentUtils.safeGetParcelableExtra(
- activity.getIntent(), IntentHandler.EXTRA_PARENT_COMPONENT);
- if (parent != null) {
- intent.setComponent(parent);
- } else {
- Log.d(TAG, "Cannot return fullscreen tab to parent Activity.");
- // Tab.detachAndStartReparenting will give the intent a default component if it
- // has none.
- }
-
- // TODO(peconn): Deal with tricky multiwindow scenarios.
- }
- intent.putExtra(Browser.EXTRA_APPLICATION_ID, activity.getPackageName());
-
- tab.detachAndStartReparenting(intent, null, setFullscreen);
- }
-}

Powered by Google App Engine
This is Rietveld 408576698