| 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..d13e5f097b086fbbbd394bcc5ff02fb2e880ab8d 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
|
| @@ -47,7 +47,6 @@ import org.chromium.content.browser.ContextualSearchClient;
|
| import org.chromium.content_public.browser.GestureStateListener;
|
| import org.chromium.content_public.browser.LoadUrlParams;
|
| import org.chromium.content_public.browser.NavigationEntry;
|
| -import org.chromium.content_public.browser.WebContentsObserver;
|
| import org.chromium.content_public.common.TopControlsState;
|
| import org.chromium.ui.base.WindowAndroid;
|
|
|
| @@ -88,7 +87,6 @@ public class ContextualSearchManager extends ContextualSearchObservable
|
| private final ViewTreeObserver.OnGlobalFocusChangeListener mOnFocusChangeListener;
|
|
|
| private final WindowAndroid mWindowAndroid;
|
| - private WebContentsObserver mSearchWebContentsObserver;
|
| private ContextualSearchContentViewDelegate mSearchContentViewDelegate;
|
| private final ContextualSearchTabPromotionDelegate mTabPromotionDelegate;
|
| private TabModelSelectorTabObserver mTabModelSelectorTabObserver;
|
| @@ -866,6 +864,12 @@ public class ContextualSearchManager extends ContextualSearchObservable
|
|
|
| @Override
|
| public void onContentViewCreated(ContentViewCore contentViewCore) {
|
| + if (mPolicy.shouldInjectJavaScript()) {
|
| + // Enable a JavaScript communication channel between our service and the new view.
|
| + nativeEnableContextualSearchServiceForView(mNativeContextualSearchManagerPtr,
|
| + contentViewCore);
|
| + }
|
| +
|
| // TODO(mdjones): Move SearchContentViewDelegate ownership to panel.
|
| mSearchContentViewDelegate.setContextualSearchContentViewCore(contentViewCore);
|
| }
|
| @@ -1228,4 +1232,6 @@ public class ContextualSearchManager extends ContextualSearchObservable
|
| private native void nativeGatherSurroundingText(long nativeContextualSearchManager,
|
| String selection, boolean useResolvedSearchTerm, ContentViewCore baseContentViewCore,
|
| boolean maySendBasePageUrl);
|
| + private native void nativeEnableContextualSearchServiceForView(
|
| + long nativeContextualSearchManager, ContentViewCore overlayContentViewCore);
|
| }
|
|
|