Integrate new Reader Mode panel

chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java

Index: chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
index f9d849a4d034848be4f6f088383a5d3b87b8b557..2a3bb27a12c3d7fc227d4297e54bc01a0e232380 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java
@@ -49,8 +49,6 @@ import org.chromium.chrome.browser.contextualsearch.ContextualSearchTabHelper;
 import org.chromium.chrome.browser.crash.MinidumpUploadService;
 import org.chromium.chrome.browser.customtabs.CustomTabActivity;
 import org.chromium.chrome.browser.device.DeviceClassManager;
-import org.chromium.chrome.browser.dom_distiller.ReaderModeActivityDelegate;
-import org.chromium.chrome.browser.dom_distiller.ReaderModeManager;
 import org.chromium.chrome.browser.download.ChromeDownloadDelegate;
 import org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarkUtils;
 import org.chromium.chrome.browser.fullscreen.FullscreenManager;
@@ -356,8 +354,6 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
 
     protected Handler mHandler;
 
-    private final ReaderModeManager mReaderModeManager;
-
     private class TabContentViewClient extends ContentViewClient {
         @Override
         public void onBackgroundColorChanged(int color) {
@@ -580,7 +576,6 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
             }
         };
 
-        mReaderModeManager = new ReaderModeManager(this, activity);
         mTabRedirectHandler = new TabRedirectHandler(activity);
         addObserver(mTabObserver);
 
@@ -1367,14 +1362,6 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
     }
 
     /**
-     * TODO(aruslan): remove this.
-     * Temporary overload to avoid 2-way commit.
-     */
-    public void attachOverlayContentViewCore(ContentViewCore content, boolean visible) {
-        attachOverlayContentViewCore(content, visible, true);
-    }
-
-    /**
      * Removes a {@link ContentViewCore} overlay object from this {@link Tab}.  This
      * {@link ContentViewCore} must have previously been added via
      * {@link #attachOverlayContentViewCore(ContentViewCore, boolean)}.
@@ -2802,17 +2789,6 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
     }
 
     /**
-     * @return The reader mode manager for this tab that handles UI events for reader mode.
-     */
-    public ReaderModeManager getReaderModeManager() {
-        return mReaderModeManager;
-    }
-
-    public ReaderModeActivityDelegate getReaderModeActivityDelegate() {
-        return mActivity == null ? null : mActivity.getReaderModeActivityDelegate();
-    }
-
-    /**
      * Check whether the context menu download should be intercepted.
      *
      * @param url URL to be downloaded.