chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.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/contextualsearch/ContextualSearchManager.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/compositor/scene_layer/ReaderModeSceneLayer.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/ReaderModeActivityDelegate.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/contextualsearch/ContextualSearchManager.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java

index fbccb81590c7f6f237137768b0b91cb20cbaf9a0..9b60ec232dfe29f39a36e86a22925df91f4088ca 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java

@@ -473,7 +473,6 @@ public class ContextualSearchManager extends ContextualSearchObservable

// If the user action was not a long-press, immediately start loading content.

mShouldLoadDelayedSearch = false;

}

if (isTap && mPolicy.shouldPreviousTapResolve(

mNetworkCommunicator.getBasePageUrl())) {

mNetworkCommunicator.startSearchTermResolutionRequest(

@@ -698,7 +697,6 @@ public class ContextualSearchManager extends ContextualSearchObservable

public void handleSearchTermResolutionResponse(boolean isNetworkUnavailable, int responseCode,

String searchTerm, String displayText, String alternateTerm, boolean doPreventPreload,

int selectionStartAdjust, int selectionEndAdjust, String contextLanguage) {

- if (!mSearchPanel.isShowing()) return;

// Show an appropriate message for what to search for.

String message;