Hook up Reader Mode InfoBar

chrome/android/java/src/org/chromium/chrome/browser/infobar/ReaderModeInfoBar.java

 // 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.infobar;
 
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.TextView;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel;
+import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel.StateChangeReason;
 import org.chromium.chrome.browser.dom_distiller.ReaderModeManager;
 import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.content_public.browser.WebContents;
+import org.chromium.content_public.browser.WebContentsObserver;
 
 /**
  * This is the InfoBar implementation of the Reader Mode UI. This is used in place of the
  * {@link OverlayPanel} implementation when Chrome Home is enabled.
  */
 public class ReaderModeInfoBar extends InfoBar {
     /** A handle to the {@link ReaderModeManager} to trigger page navigations. */
     private static ReaderModeManager sManager;
 
+    /** A {@link WebContentsObserver} to watch for page navigations. */
+    private WebContentsObserver mWebContentsObserver;
+
+    /** The {@link WebContents} that this infobar is operating on. */
+    private WebContents mWebContents;
+
     /**
      * Default constructor.
      */
     private ReaderModeInfoBar() {
         super(R.drawable.infobar_mobile_friendly, null, null);
     }
 
     @Override
     protected boolean usesCompactLayout() {
         return true;
     }
 
     @Override
     protected void createCompactLayoutContent(InfoBarCompactLayout layout) {
         TextView prompt = new TextView(getContext());
         prompt.setText(R.string.reader_view_text);
         prompt.setSingleLine();
         prompt.setTextSize(TypedValue.COMPLEX_UNIT_PX,
                 getContext().getResources().getDimension(R.dimen.infobar_text_size));
         prompt.setTextColor(
                 ApiCompatibilityUtils.getColor(layout.getResources(), R.color.default_text_color));
         prompt.setGravity(Gravity.CENTER_VERTICAL);
 
+        mWebContentsObserver = new WebContentsObserver() {
+            @Override

[Ted C, 2017/05/19 23:19:07]

per some offline discussion, infobars "should" delete themselves on navigations

https://cs.chromium.org/chromium/src/components/infobars/core/infobar_delegat...

[mdjones, 2017/05/22 21:11:02]

Done.

+            public void didStartNavigation(String url, boolean isInMainFrame,
+                    boolean isSameDocument, boolean isErrorPage) {
+                if (!isInMainFrame) return;
+
+                // If a navigation was triggered close this infobar.
+                nativeHide(getNativeInfoBarPtr());
+                destroyWebContentsObserver();
+            }
+        };
+
+        mWebContents = sManager.getBasePageWebContents();
+        sManager.getBasePageWebContents().addObserver(mWebContentsObserver);
+
         prompt.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                // TODO(mdjones): Trigger navigation from manager.
+                destroyWebContentsObserver();
+                sManager.navigateToReaderMode();
             }
         });
 
         layout.addContent(prompt, 1f);
     }
 
+    @Override
     public void onCloseButtonClicked() {
         super.onCloseButtonClicked();
-
-        // TODO(mdjones): Notifiy the manager that the infobar was closed.
+        destroyWebContentsObserver();
+        sManager.onClosed(StateChangeReason.CLOSE_BUTTON);
     }
 
     /**
+     * Detach and null the infobar's web contents observer.
+     */
+    private void destroyWebContentsObserver() {
+        if (mWebContentsObserver == null) return;
+
+        mWebContents.removeObserver(mWebContentsObserver);
+        mWebContentsObserver = null;
+    }
+
+    @Override
+    protected void onNativeDestroyed() {
+        super.onNativeDestroyed();
+        destroyWebContentsObserver();
+    }
+
+    /**
      * Create and show the Reader Mode {@link InfoBar}.
      * @param tab The tab that the {@link InfoBar} should be shown in.
      * @param manager The {@link ReaderModeManager} for this instance of Chrome.
      */
     public static void showReaderModeInfoBar(Tab tab, ReaderModeManager manager) {
         sManager = manager;
         nativeCreate(tab);
     }
 
     /**
      * @return An instance of the {@link ReaderModeInfoBar}.
      */
     @CalledByNative
     private static ReaderModeInfoBar create() {
         return new ReaderModeInfoBar();
     }
 
     private static native void nativeCreate(Tab tab);
+    private native void nativeHide(long nativeReaderModeInfoBar);
 }