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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java

Issue 2644933002: [TTS] Fix a test that's failing with PlzNavigate enabled. (Closed)
Patch Set: Decided to change back to @code in the comment. Created 3 years, 11 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 | chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchNetworkCommunicator.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 edbf1afa2ac2bd000ff246236949714b7afbb038..9110a764718dd69b1c156fc65be64def9ebe5f5c 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
@@ -849,6 +849,11 @@ public class ContextualSearchManager implements ContextualSearchManagementDelega
mSearchPanel.onContextualSearchPrefChanged(isEnabled);
}
+ @Override
+ public void stopPanelContentsNavigation() {
+ mSearchPanel.getContentViewCore().getWebContents().stop();
+ }
+
// ============================================================================================
// Observers
// ============================================================================================
@@ -1098,7 +1103,7 @@ public class ContextualSearchManager implements ContextualSearchManagementDelega
// Stop loading the page that displays the error to the user.
if (mSearchPanel.getContentViewCore() != null) {
// When running tests the Content View might not exist.
- mSearchPanel.getContentViewCore().getWebContents().stop();
+ mNetworkCommunicator.stopPanelContentsNavigation();
}
mSearchRequest.setHasFailed();
mSearchRequest.setNormalPriority();
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchNetworkCommunicator.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698