Chromium Code Reviews| 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 da63bbb6eadf8a53a76013ced634188d0693793e..9fe044ea02367bc3c9d2cb07213a7d06f3ee452b 100644 |
| --- a/chrome/browser/android/compositor/layer/toolbar_layer.cc |
| +++ b/chrome/browser/android/compositor/layer/toolbar_layer.cc |
| @@ -12,7 +12,6 @@ |
| #include "ui/android/resources/ui_resource_android.h" |
| const SkColor kNormalAnonymizeContentColor = SK_ColorWHITE; |
|
David Trainor- moved to gerrit
2015/08/03 20:12:44
Do we still need this one? Let's just leave the c
Yusuf
2015/08/03 20:39:08
We use it on construction, but yeah we will always
Yusuf
2015/08/25 20:55:25
Updated to remove this in the last patch.
|
| -const SkColor kIncognitoAnonymizeContentColor = 0xFF737373; |
| namespace chrome { |
| namespace android { |
| @@ -29,7 +28,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) { |
| DCHECK(resource); |
| @@ -44,9 +43,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); |