[Contextual Search] Add support for a static icon

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

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchBarControl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchBarControl.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchBarControl.java
index c5a88846ebdc5e4c968a4a31984eac74e0feaa71..8ebed3d1d05b872033b5b1ccaf0cc79bdd5c045a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchBarControl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchBarControl.java
@@ -52,6 +52,11 @@ public class ContextualSearchBarControl
     private final ContextualSearchQuickActionControl mQuickActionControl;
 
     /**
+     * The {@link ContextualSearchImageControl} for the panel.
+     */
+    private ContextualSearchImageControl mImageControl;
+
+    /**
      * The opacity of the Bar's Search Context.
      */
     private float mSearchBarContextOpacity = 1.f;
@@ -78,6 +83,7 @@ public class ContextualSearchBarControl
                                       ViewGroup container,
                                       DynamicResourceLoader loader) {
         mOverlayPanel = panel;
+        mImageControl = new ContextualSearchImageControl(panel, context);
         mContextControl = new ContextualSearchContextControl(panel, context, container, loader);
         mSearchTermControl = new ContextualSearchTermControl(panel, context, container, loader);
         mCaptionControl = new ContextualSearchCaptionControl(panel, context, container, loader);
@@ -90,6 +96,13 @@ public class ContextualSearchBarControl
     }
 
     /**
+     * @return The {@link ContextualSearchImageControl} for the panel.
+     */
+    public ContextualSearchImageControl getImageControl() {
+        return mImageControl;
+    }
+
+    /**
      * Returns the minimum height that the text layer (containing the Search Context, Term and
      * Caption) should be.
      */
@@ -209,6 +222,7 @@ public class ContextualSearchBarControl
             // TODO(twellington): should the quick action caption be stored separately from the
             // regular caption?
             mCaptionControl.setCaption(mQuickActionControl.getCaption());
+            mImageControl.setStaticIconResourceId(mQuickActionControl.getIconResId());
         }
     }