[Contextual Search] Add a handle to the bar when Chrome Home is enabled

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

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 d17d21e6f9264ae2de3aa9f7299a0aee5b0e23d3..0c60a28fb5958d4a6570159a452e693b327d7809 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
@@ -38,6 +38,8 @@ import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
 import org.chromium.chrome.browser.tabmodel.TabModelObserver;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabObserver;
+import org.chromium.chrome.browser.toolbar.BottomToolbarPhone;
+import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.chrome.browser.widget.findinpage.FindToolbarManager;
 import org.chromium.chrome.browser.widget.findinpage.FindToolbarObserver;
 import org.chromium.components.navigation_interception.NavigationParams;
@@ -290,6 +292,11 @@ public class ContextualSearchManager implements ContextualSearchManagementDelega
     public void setContextualSearchPanel(ContextualSearchPanel panel) {
         mSearchPanel = panel;
         mPolicy.setContextualSearchPanel(panel);
+
+        if (!FeatureUtilities.isChromeHomeEnabled()) return;

[mdjones, 2017/04/07 15:47:13]

Does contextual search work on CCTs or webapps? If contextual search still has a
handle to the activity, you could check if getBottomSheet() returns null.

[Theresa, 2017/04/07 16:26:43]

It works in CCTs. Changed the check.

+
+        mSearchPanel.initializeBarHandle(
+                (BottomToolbarPhone) mActivity.getToolbarManager().getToolbar());
     }
 
     @Override