| Index: chrome/browser/android/compositor/layer/toolbar_layer.cc
|
| diff --git a/chrome/browser/android/compositor/layer/toolbar_layer.cc b/chrome/browser/android/compositor/layer/toolbar_layer.cc
|
| index dff426375783fb26cf6036c84247d9218ac347f1..1028e681c970fe0b61e06396a2757f0a52f923f1 100644
|
| --- a/chrome/browser/android/compositor/layer/toolbar_layer.cc
|
| +++ b/chrome/browser/android/compositor/layer/toolbar_layer.cc
|
| @@ -11,9 +11,6 @@
|
| #include "ui/android/resources/resource_manager.h"
|
| #include "ui/android/resources/ui_resource_android.h"
|
|
|
| -const SkColor kNormalAnonymizeContentColor = SK_ColorWHITE;
|
| -const SkColor kIncognitoAnonymizeContentColor = 0xFF737373;
|
| -
|
| namespace chrome {
|
| namespace android {
|
|
|
| @@ -29,7 +26,7 @@ scoped_refptr<cc::Layer> ToolbarLayer::layer() {
|
| void ToolbarLayer::PushResource(
|
| ui::ResourceManager::Resource* resource,
|
| bool anonymize,
|
| - bool anonymize_component_is_incognito,
|
| + int toolbar_textbox_background_color,
|
| bool show_debug,
|
| float brightness) {
|
| DCHECK(resource);
|
| @@ -45,9 +42,7 @@ void ToolbarLayer::PushResource(
|
| if (anonymize) {
|
| anonymize_layer_->SetPosition(resource->aperture.origin());
|
| anonymize_layer_->SetBounds(resource->aperture.size());
|
| - anonymize_layer_->SetBackgroundColor(anonymize_component_is_incognito
|
| - ? kIncognitoAnonymizeContentColor
|
| - : kNormalAnonymizeContentColor);
|
| + anonymize_layer_->SetBackgroundColor(toolbar_textbox_background_color);
|
| }
|
|
|
| debug_layer_->SetBounds(resource->size);
|
| @@ -125,7 +120,7 @@ ToolbarLayer::ToolbarLayer()
|
| layer_->AddChild(progress_bar_layer_);
|
|
|
| anonymize_layer_->SetIsDrawable(true);
|
| - anonymize_layer_->SetBackgroundColor(kNormalAnonymizeContentColor);
|
| + anonymize_layer_->SetBackgroundColor(SK_ColorWHITE);
|
| layer_->AddChild(anonymize_layer_);
|
|
|
| debug_layer_->SetIsDrawable(true);
|
|
|