Index: chrome/browser/android/compositor/layer/tab_layer.cc |
diff --git a/chrome/browser/android/compositor/layer/tab_layer.cc b/chrome/browser/android/compositor/layer/tab_layer.cc |
index 145494c8d366ce86647485a5b3463a9a582290eb..1ef32a197bc59d87d924839517028f56e9780da6 100644 |
--- a/chrome/browser/android/compositor/layer/tab_layer.cc |
+++ b/chrome/browser/android/compositor/layer/tab_layer.cc |
@@ -96,7 +96,9 @@ void TabLayer::SetProperties(int id, |
bool show_toolbar, |
int toolbar_background_color, |
bool anonymize_toolbar, |
+ int toolbar_textbox_resource_id, |
int toolbar_textbox_background_color, |
+ float toolbar_textbox_alpha, |
float toolbar_alpha, |
float toolbar_y_offset, |
float side_border_scale, |
@@ -186,6 +188,8 @@ void TabLayer::SetProperties(int id, |
toolbar_background_color, |
anonymize_toolbar, |
toolbar_textbox_background_color, |
+ toolbar_textbox_resource_id, |
+ toolbar_textbox_alpha, |
false, |
1.f); |
toolbar_layer_->UpdateProgressBar(0, 0, 0, 0, 0, 0, 0, 0, 0, 0); |
@@ -543,7 +547,7 @@ TabLayer::TabLayer(bool incognito, |
resource_manager_(resource_manager), |
layer_title_cache_(layer_title_cache), |
layer_(cc::Layer::Create(content::Compositor::LayerSettings())), |
- toolbar_layer_(ToolbarLayer::Create()), |
+ toolbar_layer_(ToolbarLayer::Create(resource_manager)), |
title_(cc::Layer::Create(content::Compositor::LayerSettings())), |
content_(ContentLayer::Create(tab_content_manager)), |
padding_( |