PageInfoController: signatures changed from Tab to WebContents

Why:
Currently, PageInfo shows the page-info dialog for Tab only. Since we
would like the dialog works for WebContents in general. We want to
refactor PageInfoController to depend on WebContents rather than Tab.
This patch is part of the effort.

Change:
* getOfflinePage() depends on Tab -> WebContents
* isShowingTrustedOfflinePage() depends on Tab -> WebContents
* TabImpl.getProfile() -> Profile.fromWebContents()
* Activity -> ChromeActivity, because ConnectionInfoPopup.show()
depends on ChromeActivity.

Bug: 999196
Change-Id: Idb432edbbdb839d1b3cae2bfced6a4343861e7d7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1960565Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Commit-Queue: Liquan (Max) Gu <maxlg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#723536}

chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageTabObserver.java

@@ -330,7 +330,7 @@ public class OfflinePageTabObserver
                 RecordUserAction.record("OfflinePages.ReloadButtonClicked");
                 Tab foundTab = tabModelSelector.getTabById(tabId);
                 if (foundTab == null) return;
-                if (!OfflinePageUtils.isShowingTrustedOfflinePage(foundTab)) {
+                if (!OfflinePageUtils.isShowingTrustedOfflinePage(foundTab.getWebContents())) {
                     RecordUserAction.record("OfflinePages.ReloadButtonClickedViewingUntrustedPage");
                 }
                 // Delegates to Tab to reload the page. Tab will send the correct header in order to

chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java

@@ -118,7 +118,7 @@ public class OfflinePageUtils {
          * @param tab The current tab.
          * @return True if a trusted offline page is shown in the tab.
          */
-        boolean isShowingTrustedOfflinePage(Tab tab);
+        boolean isShowingTrustedOfflinePage(WebContents webContents);
 
         /**
          * Returns whether the tab is showing offline preview.
@@ -187,16 +187,13 @@ public class OfflinePageUtils {
         }
 
         @Override
-        public boolean isShowingTrustedOfflinePage(Tab tab) {
-            if (tab == null) return false;
-
-            WebContents webContents = tab.getWebContents();
+        public boolean isShowingTrustedOfflinePage(WebContents webContents) {
             if (webContents == null) return false;
 
             OfflinePageBridge offlinePageBridge =
-                    getOfflinePageBridge(((TabImpl) tab).getProfile());
+                    getOfflinePageBridge(Profile.fromWebContents(webContents));
             if (offlinePageBridge == null) return false;
-            return offlinePageBridge.isShowingTrustedOfflinePage(tab.getWebContents());
+            return offlinePageBridge.isShowingTrustedOfflinePage(webContents);
         }
     }
 
@@ -619,14 +616,14 @@ public class OfflinePageUtils {
 
     /**
      * Retrieves the extra request header to reload the offline page.
-     * @param tab The current tab.
+     * @param webContents The current WebContents.
      * @return The extra request header string.
      */
-    public static String getOfflinePageHeaderForReload(Tab tab) {
+    public static String getOfflinePageHeaderForReload(WebContents webContents) {
         OfflinePageBridge offlinePageBridge =
-                getInstance().getOfflinePageBridge(((TabImpl) tab).getProfile());
+                getInstance().getOfflinePageBridge(Profile.fromWebContents(webContents));
         if (offlinePageBridge == null) return "";
-        return offlinePageBridge.getOfflinePageHeaderForReload(tab.getWebContents());
+        return offlinePageBridge.getOfflinePageHeaderForReload(webContents);
     }
 
     /**
@@ -689,26 +686,25 @@ public class OfflinePageUtils {
     }
 
     /**
-     * Retrieves the offline page that is shown for the tab.
-     * @param tab The tab to be reloaded.
+     * Retrieves the offline page that is shown for the web-content.
+     * @param webContents The WebContents to be reloaded.
      * @return The offline page if tab currently displays it, null otherwise.
      */
-    public static OfflinePageItem getOfflinePage(Tab tab) {
-        WebContents webContents = tab.getWebContents();
+    public static OfflinePageItem getOfflinePage(WebContents webContents) {
         if (webContents == null) return null;
         OfflinePageBridge offlinePageBridge =
-                getInstance().getOfflinePageBridge(((TabImpl) tab).getProfile());
+                getInstance().getOfflinePageBridge(Profile.fromWebContents(webContents));
         if (offlinePageBridge == null) return null;
         return offlinePageBridge.getOfflinePage(webContents);
     }
 
     /**
-     * Returns whether the tab is showing a trusted offline page.
-     * @param tab The current tab.
-     * @return True if the tab is showing a trusted offline page.
+     * Returns whether the WebContents is showing trusted offline page.
+     * @param webContents The current WebContents.
+     * @return True if a trusted offline page is shown in the webContents.
      */
-    public static boolean isShowingTrustedOfflinePage(Tab tab) {
-        return getInstance().isShowingTrustedOfflinePage(tab);
+    public static boolean isShowingTrustedOfflinePage(WebContents webContents) {
+        return getInstance().isShowingTrustedOfflinePage(webContents);
     }
 
     /**
@@ -716,19 +712,20 @@ public class OfflinePageUtils {
      * @param tab The tab to be reloaded.
      */
     public static void reload(Tab tab) {
+        WebContents webContents = tab.getWebContents();
         // Only the transition type with both RELOAD and FROM_ADDRESS_BAR set will force the
         // navigation to be treated as reload (see ShouldTreatNavigationAsReload()). Without this,
         // reloading an URL containing a hash will be treated as same document load and thus
         // no loading is triggered.
         int transitionTypeForReload = PageTransition.RELOAD | PageTransition.FROM_ADDRESS_BAR;
 
-        OfflinePageItem offlinePage = getOfflinePage(tab);
-        if (isShowingTrustedOfflinePage(tab) || offlinePage == null) {
+        OfflinePageItem offlinePage = getOfflinePage(webContents);
+        if (isShowingTrustedOfflinePage(tab.getWebContents()) || offlinePage == null) {
             // If current page is an offline page, reload it with custom behavior defined in extra
             // header respected.
             LoadUrlParams params =
                     new LoadUrlParams(((TabImpl) tab).getOriginalUrl(), transitionTypeForReload);
-            params.setVerbatimHeaders(getOfflinePageHeaderForReload(tab));
+            params.setVerbatimHeaders(getOfflinePageHeaderForReload(webContents));
             tab.loadUrl(params);
             return;
         }
@@ -832,7 +829,7 @@ public class OfflinePageUtils {
             // We first compute the bitwise tab restore context.
             int tabRestoreContext = 0;
             if (isConnected()) tabRestoreContext |= BIT_ONLINE;
-            OfflinePageItem page = getOfflinePage(tab);
+            OfflinePageItem page = getOfflinePage(tab.getWebContents());
             if (page != null) {
                 tabRestoreContext |= BIT_OFFLINE_PAGE;
                 if (page.getClientId().getNamespace().equals(OfflinePageBridge.LAST_N_NAMESPACE)) {

chrome/android/java/src/org/chromium/chrome/browser/page_info/ConnectionInfoPopup.java

@@ -23,9 +23,8 @@ import org.chromium.base.Log;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.NativeMethods;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ResourceId;
-import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.chrome.browser.tab.TabImpl;
 import org.chromium.chrome.browser.vr.UiUnsupportedMode;
 import org.chromium.chrome.browser.vr.VrModuleProvider;
 import org.chromium.content_public.browser.WebContents;
@@ -62,10 +61,11 @@ public class ConnectionInfoPopup implements OnClickListener, ModalDialogProperti
     private Button mResetCertDecisionsButton;
     private String mLinkUrl;
 
-    private ConnectionInfoPopup(Context context, Tab tab) {
+    private ConnectionInfoPopup(
+            Context context, ModalDialogManager modalDialogManager, WebContents webContents) {
         mContext = context;
-        mModalDialogManager = ((TabImpl) tab).getActivity().getModalDialogManager();
-        mWebContents = tab.getWebContents();
+        mModalDialogManager = modalDialogManager;
+        mWebContents = webContents;
 
         mCertificateViewer = new CertificateViewer(mContext);
 
@@ -259,11 +259,10 @@ public class ConnectionInfoPopup implements OnClickListener, ModalDialogProperti
      * visible.
      *
      * @param context Context which is used for launching a dialog.
-     * @param tab The tab hosting the web contents for which to show website information. This
-     *            information is retrieved for the visible entry.
+     * @param webContents The WebContents for which to show website information
      */
-    public static void show(Context context, Tab tab) {
-        new ConnectionInfoPopup(context, tab);
+    public static void show(ChromeActivity context, WebContents webContents) {
+        new ConnectionInfoPopup(context, context.getModalDialogManager(), webContents);
     }
 
     @NativeMethods

chrome/android/java/src/org/chromium/chrome/browser/page_info/PageInfoController.java

@@ -4,7 +4,6 @@
 
 package org.chromium.chrome.browser.page_info;
 
-import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
@@ -28,6 +27,7 @@ import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.NativeMethods;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
 import org.chromium.chrome.browser.instantapps.InstantAppsHandler;
 import org.chromium.chrome.browser.offlinepages.OfflinePageItem;
@@ -155,7 +155,7 @@ public class PageInfoController
      * @param previewPageState         State of the tab showing the preview.
      * @param publisher                The name of the content publisher, if any.
      */
-    protected PageInfoController(Activity activity, Tab tab, int securityLevel,
+    protected PageInfoController(ChromeActivity activity, Tab tab, int securityLevel,
             String offlinePageUrl, String offlinePageCreationDate,
             @OfflinePageState int offlinePageState, @PreviewPageState int previewPageState,
             String publisher) {
@@ -372,7 +372,7 @@ public class PageInfoController
 
         // Display the appropriate connection message.
         SpannableStringBuilder messageBuilder = new SpannableStringBuilder();
-        Context context = mWindowAndroid.getActivity().get();
+        ChromeActivity context = (ChromeActivity) mWindowAndroid.getActivity().get();
         assert context != null;
         if (mContentPublisher != null) {
             messageBuilder.append(
@@ -424,7 +424,7 @@ public class PageInfoController
                 runAfterDismiss(() -> {
                     if (!mTab.getWebContents().isDestroyed()) {
                         recordAction(PageInfoAction.PAGE_INFO_SECURITY_DETAILS_OPENED);
-                        ConnectionInfoPopup.show(context, mTab);
+                        ConnectionInfoPopup.show(context, mTab.getWebContents());
                     }
                 });
             };
@@ -513,8 +513,8 @@ public class PageInfoController
      * @param contentPublisher The name of the publisher of the content.
      * @param source Determines the source that triggered the popup.
      */
-    public static void show(final Activity activity, final Tab tab, final String contentPublisher,
-            @OpenedFromSource int source) {
+    public static void show(final ChromeActivity activity, final Tab tab,
+            final String contentPublisher, @OpenedFromSource int source) {
         // If the activity's decor view is not attached to window, we don't show the dialog because
         // the window manager might have revoked the window token for this activity. See
         // https://crbug.com/921450.
@@ -531,18 +531,18 @@ public class PageInfoController
             assert false : "Invalid source passed";
         }
 
-        final int securityLevel =
-                SecurityStateModel.getSecurityLevelForWebContents(tab.getWebContents());
+        WebContents webContents = tab.getWebContents();
+        final int securityLevel = SecurityStateModel.getSecurityLevelForWebContents(webContents);
 
         @PreviewPageState
         int previewPageState = PreviewPageState.NOT_PREVIEW;
         final PreviewsAndroidBridge bridge = PreviewsAndroidBridge.getInstance();
-        if (bridge.shouldShowPreviewUI(tab.getWebContents())) {
+        if (bridge.shouldShowPreviewUI(webContents)) {
             previewPageState = securityLevel == ConnectionSecurityLevel.SECURE
                     ? PreviewPageState.SECURE_PAGE_PREVIEW
                     : PreviewPageState.INSECURE_PAGE_PREVIEW;
 
-            PreviewsUma.recordPageInfoOpened(bridge.getPreviewsType(tab.getWebContents()));
+            PreviewsUma.recordPageInfoOpened(bridge.getPreviewsType(webContents));
             Tracker tracker = TrackerFactory.getTrackerForProfile(Profile.getLastUsedProfile());
             tracker.notifyEvent(EventConstants.PREVIEWS_VERBOSE_STATUS_OPENED);
         }
@@ -552,10 +552,10 @@ public class PageInfoController
         @OfflinePageState
         int offlinePageState = OfflinePageState.NOT_OFFLINE_PAGE;
 
-        OfflinePageItem offlinePage = OfflinePageUtils.getOfflinePage(tab);
+        OfflinePageItem offlinePage = OfflinePageUtils.getOfflinePage(webContents);
         if (offlinePage != null) {
             offlinePageUrl = offlinePage.getUrl();
-            if (OfflinePageUtils.isShowingTrustedOfflinePage(tab)) {
+            if (OfflinePageUtils.isShowingTrustedOfflinePage(webContents)) {
                 offlinePageState = OfflinePageState.TRUSTED_OFFLINE_PAGE;
             } else {
                 offlinePageState = OfflinePageState.UNTRUSTED_OFFLINE_PAGE;

chrome/android/java/src/org/chromium/chrome/browser/page_info/SiteSettingsHelper.java

@@ -15,6 +15,7 @@ import org.chromium.chrome.browser.settings.website.SingleWebsitePreferences;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabImpl;
 import org.chromium.chrome.browser.util.UrlConstants;
+import org.chromium.content_public.browser.WebContents;
 import org.chromium.net.GURLUtils;
 
 /**
@@ -26,9 +27,10 @@ public class SiteSettingsHelper {
      * Whether site settings is available for a given {@link Tab}.
      */
     public static boolean isSiteSettingsAvailable(Tab tab) {
-        boolean isOfflinePage = OfflinePageUtils.getOfflinePage(tab) != null;
+        WebContents webContents = tab.getWebContents();
+        boolean isOfflinePage = OfflinePageUtils.getOfflinePage(webContents) != null;
         boolean isPreviewPage =
-                PreviewsAndroidBridge.getInstance().shouldShowPreviewUI(tab.getWebContents());
+                PreviewsAndroidBridge.getInstance().shouldShowPreviewUI(webContents);
         String scheme = GURLUtils.getScheme(((TabImpl) tab).getOriginalUrl());
         return !isOfflinePage && !isPreviewPage
                 && (UrlConstants.HTTP_SCHEME.equals(scheme)

chrome/android/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java

@@ -184,7 +184,7 @@ public class LocationBarModel implements ToolbarDataProvider, ToolbarCommonPrope
                     DomDistillerTabUtils.getFormattedUrlFromOriginalDistillerUrl(originalUrl));
 
             // Clear the editing text for untrusted offline pages.
-            if (!OfflinePageUtils.isShowingTrustedOfflinePage(mTab)) {
+            if (!OfflinePageUtils.isShowingTrustedOfflinePage(mTab.getWebContents())) {
                 return buildUrlBarData(url, formattedUrl, "");
             }
 

chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/CustomTabToolbar.java

@@ -45,6 +45,7 @@ import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.base.task.PostTask;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ActivityTabProvider;
+import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.WindowDelegate;
 import org.chromium.chrome.browser.native_page.NativePage;
 import org.chromium.chrome.browser.native_page.NativePageFactory;
@@ -594,8 +595,8 @@ public class CustomTabToolbar extends ToolbarLayout implements View.OnLongClickL
                 if (currentTab == null || currentTab.getWebContents() == null) return;
                 Activity activity = currentTab.getWindowAndroid().getActivity().get();
                 if (activity == null) return;
-                PageInfoController.show(activity, currentTab, getContentPublisher(),
-                        PageInfoController.OpenedFromSource.TOOLBAR);
+                PageInfoController.show((ChromeActivity) activity, currentTab,
+                        getContentPublisher(), PageInfoController.OpenedFromSource.TOOLBAR);
             });
         }
 

chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtilsTest.java

@@ -383,7 +383,7 @@ public class OfflinePageUtilsTest {
         final AtomicReference<OfflinePageItem> offlinePageItem = new AtomicReference<>();
         TestThreadUtils.runOnUiThreadBlocking(() -> {
             offlinePageItem.set(OfflinePageUtils.getOfflinePage(
-                    mActivityTestRule.getActivity().getActivityTab()));
+                    mActivityTestRule.getActivity().getActivityTab().getWebContents()));
         });
 
         Assert.assertEquals("http://www.example.com/", offlinePageItem.get().getUrl());
@@ -424,7 +424,7 @@ public class OfflinePageUtilsTest {
         final AtomicReference<OfflinePageItem> offlinePageItem = new AtomicReference<>();
         TestThreadUtils.runOnUiThreadBlocking(() -> {
             offlinePageItem.set(OfflinePageUtils.getOfflinePage(
-                    mActivityTestRule.getActivity().getActivityTab()));
+                    mActivityTestRule.getActivity().getActivityTab().getWebContents()));
         });
 
         // The Offline Page Item will be empty because no data can be extracted from the renderer.
@@ -448,7 +448,7 @@ public class OfflinePageUtilsTest {
         final AtomicReference<OfflinePageItem> offlinePageItem = new AtomicReference<>();
         TestThreadUtils.runOnUiThreadBlocking(() -> {
             offlinePageItem.set(OfflinePageUtils.getOfflinePage(
-                    mActivityTestRule.getActivity().getActivityTab()));
+                    mActivityTestRule.getActivity().getActivityTab().getWebContents()));
         });
 
         Assert.assertEquals(testUrl, offlinePageItem.get().getUrl());
@@ -470,7 +470,7 @@ public class OfflinePageUtilsTest {
         final AtomicReference<OfflinePageItem> offlinePageItem = new AtomicReference<>();
         TestThreadUtils.runOnUiThreadBlocking(() -> {
             offlinePageItem.set(OfflinePageUtils.getOfflinePage(
-                    mActivityTestRule.getActivity().getActivityTab()));
+                    mActivityTestRule.getActivity().getActivityTab().getWebContents()));
         });
 
         Assert.assertEquals(testUrl, offlinePageItem.get().getUrl());
@@ -497,7 +497,7 @@ public class OfflinePageUtilsTest {
         // Verify that we are currently showing a trusted page.
         TestThreadUtils.runOnUiThreadBlocking(() -> {
             Assert.assertTrue(OfflinePageUtils.isShowingTrustedOfflinePage(
-                    mActivityTestRule.getActivity().getActivityTab()));
+                    mActivityTestRule.getActivity().getActivityTab().getWebContents()));
         });
     }
 

chrome/android/javatests/src/org/chromium/chrome/browser/page_info/ConnectionInfoPopupTest.java

@@ -39,7 +39,8 @@ public class ConnectionInfoPopupTest {
     public void testShow() throws InterruptedException {
         mActivityTestRule.startMainActivityOnBlankPage();
         TestThreadUtils.runOnUiThreadBlocking(
-                () -> ConnectionInfoPopup.show(mActivityTestRule.getActivity(),
-                                mActivityTestRule.getActivity().getActivityTab()));
+                ()
+                        -> ConnectionInfoPopup.show(mActivityTestRule.getActivity(),
+                                mActivityTestRule.getActivity().getActivityTab().getWebContents()));
     }
 }