[Contextual Search] Add support for a static icon

chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanel.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.compositor.bottombar.contextualsearch;
 
 import android.app.Activity;
 import android.content.Context;
 import android.os.Handler;
 
@@ skipping 234 matching lines @@
     // ============================================================================================
 
     @Override
     protected void onClosed(StateChangeReason reason) {
         // Must be called before destroying Content because unseen visits should be removed from
         // history, and if the Content gets destroyed there won't be a ContentViewCore to do that.
         mManagementDelegate.onCloseContextualSearch(reason);
 
         setProgressBarCompletion(0);
         setProgressBarVisible(false);
-        getImageControl().hideThumbnail(false);
+        getImageControl().hideStaticIcon(false);
 
         super.onClosed(reason);
 
         if (mSceneLayer != null) mSceneLayer.hideTree();
     }
 
     // ============================================================================================
     // Generic Event Handling
     // ============================================================================================
 
@@ skipping 217 matching lines @@
         return mHasContentBeenTouched;
     }
 
     /**
      * Sets the search term to display in the SearchBar.
      * This should be called when the search term is set without search term resolution, or
      * after search term resolution completed.
      * @param searchTerm The string that represents the search term.
      */
     public void setSearchTerm(String searchTerm) {
-        getImageControl().hideThumbnail(true);
+        getImageControl().hideStaticIcon(true);
         getSearchBarControl().setSearchTerm(searchTerm);
         mPanelMetrics.onSearchRequestStarted();
     }
 
     /**
      * Sets the search context to display in the SearchBar.
      * @param selection The portion of the context that represents the user's selection.
      * @param end The portion of the context from the selection to its end.
      */
     public void setSearchContext(String selection, String end) {
-        getImageControl().hideThumbnail(true);
+        getImageControl().hideStaticIcon(true);
         getSearchBarControl().setSearchContext(selection, end);
         mPanelMetrics.onSearchRequestStarted();
     }
 
     /**
      * Sets the caption to display in the SearchBar.
      * When the caption is displayed, the Search Term is pushed up and the caption shows below.
      * @param caption The string to show in as the caption.
      */
     public void setCaption(String caption) {
@@ skipping 142 matching lines @@
     protected void destroySearchBarControl() {
         if (mSearchBarControl != null) {
             mSearchBarControl.destroy();
             mSearchBarControl = null;
         }
     }
 
     // ============================================================================================
     // Image Control
     // ============================================================================================
-
-    // TODO(twellington): The image control should move to ContextualSearchBarControl since it
-    // is a part of the Bar.
-    private ContextualSearchImageControl mImageControl;
-
     /**
      * @return The {@link ContextualSearchImageControl} for the panel.
      */
     public ContextualSearchImageControl getImageControl() {
-        if (mImageControl == null) {
-            mImageControl = new ContextualSearchImageControl(this, mContext);
-        }
-        return mImageControl;
+        return getSearchBarControl().getImageControl();
     }
 
     // ============================================================================================
     // Peek Promo
     // ============================================================================================
 
     private ContextualSearchPeekPromoControl mPeekPromoControl;
 
     /**
      * Creates the ContextualSearchPeekPromoControl, if needed.
@@ skipping 108 matching lines @@
 
     /**
      * Destroy the current content in the panel.
      * NOTE(mdjones): This should not be exposed. The only use is in ContextualSearchManager for a
      * bug related to loading new panel content.
      */
     public void destroyContent() {
         super.destroyOverlayPanelContent();
     }
 }