Plumb the anonymize rect color to toolbar_layer from Tab#getThemeColor

chrome/browser/android/compositor/layer/toolbar_layer.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/android/compositor/layer/toolbar_layer.h"
 
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/ui_resource_layer.h"
 #include "content/public/browser/android/compositor.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/android/resources/resource_manager.h"
 #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 color as default, as whenever
it's shown we'll have a valid color right?

[Yusuf, 2015/08/03 20:39:08]

We use it on construction, but yeah we will always update to the valid color.

[Yusuf, 2015/08/25 20:55:25]

Updated to remove this in the last patch.

-const SkColor kIncognitoAnonymizeContentColor = 0xFF737373;
 
 namespace chrome {
 namespace android {
 
 // static
 scoped_refptr<ToolbarLayer> ToolbarLayer::Create() {
   return make_scoped_refptr(new ToolbarLayer());
 }
 
 scoped_refptr<cc::Layer> ToolbarLayer::layer() {
   return 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);
 
   // This layer effectively draws over the space it takes for shadows.  Set the
   // bounds to the non-shadow size so that other things can properly line up.
   layer_->SetBounds(resource->padding.size());
 
   bitmap_layer_->SetUIResourceId(resource->ui_resource->id());
   bitmap_layer_->SetBounds(resource->size);
 
   anonymize_layer_->SetHideLayerAndSubtree(!anonymize);
   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);
   if (show_debug && !debug_layer_->parent())
     layer_->AddChild(debug_layer_);
   else if (!show_debug && debug_layer_->parent())
     debug_layer_->RemoveFromParent();
 }
 
 void ToolbarLayer::UpdateProgressBar(int progress_bar_x,
@@ skipping 61 matching lines @@
   debug_layer_->SetIsDrawable(true);
   debug_layer_->SetBackgroundColor(SK_ColorGREEN);
   debug_layer_->SetOpacity(0.5f);
 }
 
 ToolbarLayer::~ToolbarLayer() {
 }
 
 }  //  namespace android
 }  //  namespace chrome