chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java - Issue 1403813003: [Contextual Search] Fixes ContentView regressions.

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 1403813003: [Contextual Search] Fixes ContentView regressions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix Created 5 years, 2 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 | « chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/phone/ContextualSearchLayout.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchStaticEventFilter.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 6ee72c4d7ddf173911a4f9a53bb5cd7cdf9612ab..582eefde6fb65ea7041d736217bebe0b34979288 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,8 +473,6 @@ public class ContextualSearchManager extends ContextualSearchObservable

removeLastSearchVisit();

}

- mSearchPanelDelegate.setSearchContentViewVisibility(false);

boolean isTap = mSelectionController.getSelectionType() == SelectionType.TAP;

boolean didRequestSurroundings = false;

@@ -998,7 +996,7 @@ public class ContextualSearchManager extends ContextualSearchObservable

// Require a touch, but no recent loading, in order to promote to a separate tab.

// Note that tapping the opt-in button requires checking for recent loading.

return mSearchPanelDelegate.didTouchSearchContentView()

- && !mSearchPanelDelegate.didLoadAnyUrl();

+ && !mSearchPanelDelegate.isProcessingPendingNavigation();

}

/**