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

Unified Diff: chrome/android/java_staging/src/org/chromium/chrome/browser/dom_distiller/ReaderModePanel.java

Issue 1171343002: Fix history for reader mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java_staging/src/org/chromium/chrome/browser/dom_distiller/ReaderModePanel.java
diff --git a/chrome/android/java_staging/src/org/chromium/chrome/browser/dom_distiller/ReaderModePanel.java b/chrome/android/java_staging/src/org/chromium/chrome/browser/dom_distiller/ReaderModePanel.java
index ae1257cf7ec16621ad2f4d446cfe9b17570e7f2d..3f8dd328942ab06332313b1502af8b39fa487be7 100644
--- a/chrome/android/java_staging/src/org/chromium/chrome/browser/dom_distiller/ReaderModePanel.java
+++ b/chrome/android/java_staging/src/org/chromium/chrome/browser/dom_distiller/ReaderModePanel.java
@@ -640,6 +640,10 @@ public class ReaderModePanel implements ChromeAnimation.Animatable<ReaderModePan
mDistilledContentViewCore = createDistillerContentViewCore(
mReaderModeHost.getTab().getContentViewCore().getContext(),
mReaderModeHost.getTab().getWindowAndroid());
+
+ mergeNavigationHistory(mDistilledContentViewCore.getWebContents(),
+ mReaderModeHost.getTab().getWebContents());
+
mDistilledContentObserver = new WebContentsObserver(
mDistilledContentViewCore.getWebContents()) {
@Override
@@ -702,8 +706,6 @@ public class ReaderModePanel implements ChromeAnimation.Animatable<ReaderModePan
mDistilledContentObserver = null;
mDistilledContentViewCore.setContentViewClient(new ContentViewClient());
- mergeNavigationHistory(mDistilledContentViewCore.getWebContents(),
- mReaderModeHost.getTab().getWebContents());
mReaderModeHost.getTab().swapContentViewCore(mDistilledContentViewCore, true,
mDidStartLoad, mDidFinishLoad);
mDistilledContentViewCore.getContentViewClient().onOffsetsForFullscreenChanged(
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698