[Contextual Search] Add support for a static icon

chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.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.scene_layer;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchBarControl;
@@ skipping 59 matching lines @@
         float searchPromoOpacity = promoControl.getOpacity();
 
         int searchPeekPromoTextViewId = peekPromoControl.getViewId();
         boolean searchPeekPromoVisible = peekPromoControl.isVisible();
         float searchPeekPromoHeightPx = peekPromoControl.getHeightPx();
         float searchPeekPromoPaddingPx =  peekPromoControl.getPaddingPx();
         float searchPeekPromoRippleWidthPx = peekPromoControl.getRippleWidthPx();
         float searchPeekPromoRippleOpacity = peekPromoControl.getRippleOpacity();
         float searchPeekPromoTextOpacity = peekPromoControl.getTextOpacity();
 
+        float staticImageVisibilityPercentage = imageControl.getStaticImageVisibilityPercentage();
+        int staticImageSize = imageControl.getStaticImageSize();
+
+        boolean staticIconVisible = imageControl.getStaticIconVisible();
+        int staticIconResId = imageControl.getStaticIconResourceId();
+
         boolean thumbnailVisible = imageControl.getThumbnailVisible();
         String thumbnailUrl = imageControl.getThumbnailUrl();
-        float thumbnailVisibilityPercentage = imageControl.getThumbnailVisibilityPercentage();
-        int thumbnailSize = imageControl.getThumbnailSize();
 
         ContextualSearchIconSpriteControl spriteControl = imageControl.getIconSpriteControl();
         boolean searchProviderIconSpriteVisible = spriteControl.isVisible();
         float searchProviderIconCompletionPercentage = spriteControl.getCompletionPercentage();
 
         float searchPanelX = panel.getOffsetX();
         float searchPanelY = panel.getOffsetY();
         float searchPanelWidth = panel.getWidth();
         float searchPanelHeight = panel.getHeight();
 
@@ skipping 27 matching lines @@
                 ? panel.getContentViewCore().getWebContents() : null;
 
         nativeUpdateContextualSearchLayer(mNativePtr,
                 R.drawable.contextual_search_bar_background,
                 searchContextViewId,
                 searchTermViewId,
                 searchCaptionViewId,
                 R.drawable.contextual_search_bar_shadow,
                 R.drawable.google_icon_sprite,
                 R.raw.google_icon_sprite,
+                staticIconResId,
                 R.drawable.breadcrumb_arrow,
                 ContextualSearchPanel.CLOSE_ICON_DRAWABLE_ID,
                 R.drawable.progress_bar_background,
                 R.drawable.progress_bar_foreground,
                 searchPromoViewId,
                 R.drawable.contextual_search_promo_ripple,
                 searchPeekPromoTextViewId,
                 mDpToPx,
                 panel.getBasePageBrightness(),
                 panel.getBasePageY() * mDpToPx,
@@ skipping 18 matching lines @@
                 searchTermOpacity,
                 searchBarControl.getSearchTermCaptionSpacing(),
                 searchCaptionAnimationPercentage,
                 searchCaptionVisible,
                 searchBarBorderVisible,
                 searchBarBorderHeight * mDpToPx,
                 searchBarShadowVisible,
                 searchBarShadowOpacity,
                 searchProviderIconSpriteVisible,
                 searchProviderIconCompletionPercentage,
+                staticIconVisible,
                 thumbnailVisible,
-                thumbnailVisibilityPercentage,
-                thumbnailSize,
                 thumbnailUrl,
+                staticImageVisibilityPercentage,
+                staticImageSize,
                 arrowIconOpacity,
                 arrowIconRotation,
                 closeIconOpacity,
                 isProgressBarVisible,
                 progressBarHeight * mDpToPx,
                 progressBarOpacity,
                 progressBarCompletion,
                 Profile.getLastUsedProfile());
     }
 
@@ skipping 42 matching lines @@
             SceneLayer contentTree);
     private native void nativeHideTree(
             long nativeContextualSearchSceneLayer);
     private native void nativeUpdateContextualSearchLayer(
             long nativeContextualSearchSceneLayer,
             int searchBarBackgroundResourceId,
             int searchContextResourceId,
             int searchTermResourceId,
             int searchCaptionResourceId,
             int searchBarShadowResourceId,
-            int panelIconResourceId,
+            int spriteResourceId,
             int searchProviderIconSpriteMetadataResourceId,
+            int staticIconResourceId,
             int arrowUpResourceId,
             int closeIconResourceId,
             int progressBarBackgroundResourceId,
             int progressBarResourceId,
             int searchPromoResourceId,
             int peekPromoRippleResourceId,
             int peekPromoTextResourceId,
             float dpToPx,
             float basePageBrightness,
             float basePageYOffset,
@@ skipping 18 matching lines @@
             float searchTermOpacity,
             float searchTermCaptionSpacing,
             float searchCaptionAnimationPercentage,
             boolean searchCaptionVisible,
             boolean searchBarBorderVisible,
             float searchBarBorderHeight,
             boolean searchBarShadowVisible,
             float searchBarShadowOpacity,
             boolean searchProviderIconSpriteVisible,
             float searchProviderIconCompletionPercentage,
+            boolean staticIconVisible,
             boolean thumbnailVisible,
-            float thumbnailVisibilityPercentage,
-            int thumbnailSize,
             String thumbnailUrl,
+            float staticImageVisibilityPercentage,
+            int staticImageSize,
             float arrowIconOpacity,
             float arrowIconRotation,
             float closeIconOpacity,
             boolean isProgressBarVisible,
             float progressBarHeight,
             float progressBarOpacity,
             int progressBarCompletion,
             Profile profile);
 }