Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java |
index 1b216d3daca916ed7df8cfa9bf57a2051664e528..c071d90d6ed9c6df8d3fc065905cf6f9c60f8048 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java |
@@ -36,6 +36,9 @@ public class ContextualSearchSceneLayer extends SceneLayer { |
* @param resourceManager |
*/ |
public void update(@Nullable ContentViewCore contentViewCore, ResourceManager resourceManager) { |
+ int searchContextViewId = mSearchPanel.getSearchContextViewId(); |
+ int searchTermViewId = mSearchPanel.getSearchTermViewId(); |
+ |
boolean searchPromoVisible = mSearchPanel.getPromoVisible(); |
float searchPromoHeightPx = mSearchPanel.getPromoHeightPx(); |
float searchPromoOpacity = mSearchPanel.getPromoOpacity(); |
@@ -47,8 +50,8 @@ public class ContextualSearchSceneLayer extends SceneLayer { |
float searchBarMarginSide = mSearchPanel.getSearchBarMarginSide(); |
float searchBarHeight = mSearchPanel.getSearchBarHeight(); |
- float searchContextOpacity = mSearchPanel.getBottomBarSearchContextOpacity(); |
- float searchTermOpacity = mSearchPanel.getBottomBarSearchTermOpacity(); |
+ float searchContextOpacity = mSearchPanel.getSearchBarContextOpacity(); |
+ float searchTermOpacity = mSearchPanel.getSearchBarTermOpacity(); |
boolean searchBarBorderVisible = mSearchPanel.isSearchBarBorderVisible(); |
float searchBarBorderY = mSearchPanel.getSearchBarBorderY(); |
@@ -70,8 +73,8 @@ public class ContextualSearchSceneLayer extends SceneLayer { |
nativeUpdateContextualSearchLayer(mNativePtr, |
R.drawable.contextual_search_bar_background, |
- R.id.contextual_search_context_view, |
- R.id.contextual_search_term_view, |
+ searchContextViewId, |
+ searchTermViewId, |
R.drawable.contextual_search_bar_shadow, |
R.drawable.google_icon, |
R.drawable.breadcrumb_arrow, |