Clean up ReaderMode OverlayPanel classes

chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java

 // Copyright 2015 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.dom_distiller;
 
 import android.content.Context;
 import android.text.TextUtils;
 
 import org.chromium.base.CommandLine;
-import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel.StateChangeReason;
 import org.chromium.chrome.browser.infobar.ReaderModeInfoBar;
-import org.chromium.chrome.browser.rappor.RapporServiceBridge;
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.chrome.browser.tabmodel.TabCreatorManager;
-import org.chromium.chrome.browser.tabmodel.TabModel;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabObserver;
 import org.chromium.chrome.browser.util.AccessibilityUtil;
 import org.chromium.components.dom_distiller.content.DistillablePageUtils;
 import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils;
-import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.NavigationController;
 import org.chromium.content_public.browser.NavigationEntry;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.browser.WebContentsObserver;
 import org.chromium.ui.UiUtils;
-import org.chromium.ui.base.PageTransition;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 /**
  * Manages UI effects for reader mode including hiding and showing the
  * reader mode and reader mode preferences toolbar icon and hiding the
  * browser controls when a reader mode page has finished loading.
  */
-public class ReaderModeManager
-        extends TabModelSelectorTabObserver implements ReaderModeManagerDelegate {
+public class ReaderModeManager extends TabModelSelectorTabObserver {
     /** POSSIBLE means reader mode can be entered. */
     public static final int POSSIBLE = 0;
 
     /** NOT_POSSIBLE means reader mode cannot be entered. */
     public static final int NOT_POSSIBLE = 1;
 
     /** STARTED means reader mode is currently in reader mode. */
     public static final int STARTED = 2;
 
     /** The url of the last page visited if the last page was reader mode page.  Otherwise null. */
@@ skipping 86 matching lines @@
         }
 
         // Make sure there is a distillability delegate set on the WebContents.
         setDistillabilityCallback(shownTabId);
 
         tryShowingInfoBar();
     }
 
     @Override
     public void onHidden(Tab tab) {
-        closeReaderPanel(StateChangeReason.UNKNOWN, false);
         ReaderModeTabInfo info = mTabStatusMap.get(tab.getId());
         if (info != null && info.isViewingReaderModePage()) {
             long timeMs = info.onExitReaderMode();
             recordReaderModeViewDuration(timeMs);
         }
     }
 
     @Override
     public void onDestroyed(Tab tab) {
         if (tab == null) return;
@@ skipping 43 matching lines @@
         // need to be preserved.
         tabInfo.setStatus(NOT_POSSIBLE);
         tabInfo.setUrl(tab.getUrl());
         tabInfo.setIsCallbackSet(false);
 
         if (tab.getWebContents() != null) {
             tabInfo.setWebContentsObserver(createWebContentsObserver(tab.getWebContents()));
             if (DomDistillerUrlUtils.isDistilledPage(tab.getUrl())) {
                 tabInfo.setStatus(STARTED);
                 mReaderModePageUrl = tab.getUrl();
-                closeReaderPanel(StateChangeReason.CONTENT_CHANGED, true);
             }
             // Make sure there is a distillability delegate set on the WebContents.
             setDistillabilityCallback(tab.getId());
         }
     }
 
-    // ReaderModeManagerDelegate:
-
-    @Override
-    public ChromeActivity getChromeActivity() {
-        return mChromeActivity;
-    }
-
-    @Override
-    public void onPanelShown() {
-        if (mTabModelSelector == null) return;
-        int tabId = mTabModelSelector.getCurrentTabId();
-
-        ReaderModeTabInfo info = mTabStatusMap.get(tabId);
-        if (info != null && !info.isInfoBarShowRecorded()) {
-            info.setIsInfoBarShowRecorded(true);
-            recordInfoBarVisibilityForNavigation(true);
-            if (LibraryLoader.isInitialized()) {
-                RapporServiceBridge.sampleDomainAndRegistryFromURL(
-                        "DomDistiller.PromptPanel", info.getUrl());
-            }
-        }
-    }
-
     /**
      * Record if the infobar became visible on the current page. This can be overridden for testing.
      * @param visible If the infobar was visible at any time.
      */
     protected void recordInfoBarVisibilityForNavigation(boolean visible) {
         RecordHistogram.recordBooleanHistogram("DomDistiller.ReaderShownForPageLoad", visible);
     }
 
-    @Override
+    /**
+     * Notify the manager that the panel has completely closed.
+     */
     public void onClosed(StateChangeReason reason) {
         if (mTabModelSelector == null) return;
 
         RecordHistogram.recordBooleanHistogram("DomDistiller.InfoBarUsage", false);
 
         int currentTabId = mTabModelSelector.getCurrentTabId();
         if (!mTabStatusMap.containsKey(currentTabId)) return;
         mTabStatusMap.get(currentTabId).setIsDismissed(true);
     }
 
-    @Override
+    /**
+     * Get the WebContents of the page that is being distilled.
+     * @return The WebContents for the currently visible tab.
+     */
     public WebContents getBasePageWebContents() {
         Tab tab = mTabModelSelector.getCurrentTab();
         if (tab == null) return null;
 
         return tab.getWebContents();
     }
 
-    @Override
-    public void closeReaderPanel(StateChangeReason reason, boolean animate) {
-        // TODO(mdjones): Remove this method and dependencies.
-    }
-
-    @Override
-    public void recordTimeSpentInReader(long timeMs) {
-        RecordHistogram.recordLongTimesHistogram("DomDistiller.Time.ViewingReaderModePanel",
-                timeMs, TimeUnit.MILLISECONDS);
-    }
-
     /**
      * @return True if the keyboard might be showing. This is not 100% accurate; see
      *         UiUtils.isKeyboardShowing(...).
      */
     protected boolean isKeyboardShowing() {
         return mChromeActivity != null && UiUtils.isKeyboardShowing(mChromeActivity,
                 mChromeActivity.findViewById(android.R.id.content));
     }
 
     protected WebContentsObserver createWebContentsObserver(final WebContents webContents) {
@@ skipping 16 matching lines @@
                 // navigations and prepare to remove any that are "chrome-distiller" urls.
                 NavigationController controller = webContents.getNavigationController();
                 int index = controller.getLastCommittedEntryIndex();
                 NavigationEntry entry = controller.getEntryAtIndex(index);
 
                 if (entry != null && DomDistillerUrlUtils.isDistilledPage(entry.getUrl())) {
                     mShouldRemovePreviousNavigation = true;
                     mLastDistillerPageIndex = index;
                 }
 
-                // If there is a navigation in the current tab, hide the bar. It will show again
-                // once the distillability test is successful.
-                if (readerTabId == mTabModelSelector.getCurrentTabId()) {
-                    closeReaderPanel(StateChangeReason.TAB_NAVIGATION, false);
-                }
-
                 // Make sure the tab was not destroyed.
                 ReaderModeTabInfo tabInfo = mTabStatusMap.get(readerTabId);
                 if (tabInfo == null) return;
 
                 tabInfo.setUrl(url);
                 if (DomDistillerUrlUtils.isDistilledPage(url)) {
                     tabInfo.setStatus(STARTED);
                     mReaderModePageUrl = url;
                 }
             }
@@ skipping 19 matching lines @@
 
                 tabInfo.setStatus(POSSIBLE);
                 if (!TextUtils.equals(url,
                         DomDistillerUrlUtils.getOriginalUrlFromDistillerUrl(
                                 mReaderModePageUrl))) {
                     tabInfo.setStatus(NOT_POSSIBLE);
                     mIsUmaRecorded = false;
                 }
                 mReaderModePageUrl = null;
 
-                if (tabInfo.getStatus() != POSSIBLE) {
-                    closeReaderPanel(StateChangeReason.UNKNOWN, false);
-                } else {
-                    tryShowingInfoBar();
-                }
+                if (tabInfo.getStatus() == POSSIBLE) tryShowingInfoBar();
             }
 
             @Override
             public void navigationEntryCommitted() {
                 // Make sure the tab was not destroyed.
                 ReaderModeTabInfo tabInfo = mTabStatusMap.get(readerTabId);
                 if (tabInfo == null) return;
                 // Reset closed state of reader mode in this tab once we know a navigation is
                 // happening.
                 tabInfo.setIsDismissed(false);
@@ skipping 60 matching lines @@
         String url = baseWebContents.getUrl();
         if (url == null) return;
 
         ReaderModeTabInfo info = mTabStatusMap.get(mTabModelSelector.getCurrentTabId());
         if (info != null) info.onStartedReaderMode();
 
         DomDistillerTabUtils.distillCurrentPageAndView(getBasePageWebContents());
     }
 
     /**
-     * Open a link from the infobar in a new tab.
-     * @param url The URL to load.
-     */
-    @Override
-    public void createNewTab(String url) {
-        if (mChromeActivity == null) return;
-
-        Tab currentTab = mTabModelSelector.getCurrentTab();
-        if (currentTab == null) return;
-
-        TabCreatorManager.TabCreator tabCreator =
-                mChromeActivity.getTabCreator(currentTab.isIncognito());
-        if (tabCreator == null) return;
-
-        tabCreator.createNewTab(new LoadUrlParams(url, PageTransition.LINK),
-                TabModel.TabLaunchType.FROM_LINK, mChromeActivity.getActivityTab());
-    }
-
-    /**
      * Set the callback for updating reader mode status based on whether or not the page should
      * be viewed in reader mode.
      * @param tabId The ID of the tab having its callback set.
      */
     private void setDistillabilityCallback(final int tabId) {
         if (tabId == Tab.INVALID_TAB_ID || mTabStatusMap.get(tabId).isCallbackSet()) {
             return;
         }
 
         if (mTabModelSelector == null) return;
@@ skipping 48 matching lines @@
     public static boolean isEnabled(Context context) {
         if (context == null) return false;
 
         boolean enabled = CommandLine.getInstance().hasSwitch(ChromeSwitches.ENABLE_DOM_DISTILLER)
                 && !CommandLine.getInstance().hasSwitch(
                            ChromeSwitches.DISABLE_READER_MODE_BOTTOM_BAR)
                 && DomDistillerTabUtils.isDistillerHeuristicsEnabled();
         return enabled;
     }
 }