chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java - Issue 1436743002: Integrate new Reader Mode panel

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java

Issue 1436743002: Integrate new Reader Mode panel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scene-layer-changes

Patch Set: findbugs and low-end devices Created 5 years, 1 month 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 | « chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanel.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java

index 2c7a455f1b468f3fc699bec4af090f855cd2cad6..6344a8410fe765406513e1e03221c1644c2201d6 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java

@@ -39,6 +39,7 @@ import org.chromium.chrome.browser.compositor.layouts.content.ContentOffsetProvi

import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;

import org.chromium.chrome.browser.contextualsearch.ContextualSearchManagementDelegate;

import org.chromium.chrome.browser.device.DeviceClassManager;

+import org.chromium.chrome.browser.dom_distiller.ReaderModeManagerDelegate;

import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;

import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager.FullscreenListener;

import org.chromium.chrome.browser.tab.EmptyTabObserver;

@@ -776,14 +777,16 @@ public class CompositorViewHolder extends FrameLayout

* @param androidContentContainer The {@link ViewGroup} the {@link LayoutManager} should bind

* Android content to.

* @param contextualSearchManager A {@link ContextualSearchManagementDelegate} instance.

+ * @param readerModeManager A {@link ReaderModeManagerDelegate} instance.

public void onFinishNativeInitialization(TabModelSelector tabModelSelector,

TabCreatorManager tabCreatorManager, TabContentManager tabContentManager,

ViewGroup androidContentContainer,

- ContextualSearchManagementDelegate contextualSearchManager) {

+ ContextualSearchManagementDelegate contextualSearchManager,

+ ReaderModeManagerDelegate readerModeManager) {

assert mLayoutManager != null;

mLayoutManager.init(tabModelSelector, tabCreatorManager, tabContentManager,

- androidContentContainer, contextualSearchManager,

+ androidContentContainer, contextualSearchManager, readerModeManager,

mCompositorView.getResourceManager().getDynamicResourceLoader());

mTabModelSelector = tabModelSelector;

tabModelSelector.addObserver(new EmptyTabModelSelectorObserver() {