CC: Plumb LayerSettings parameter for cc::Layer construction.

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;
 const SkColor kIncognitoAnonymizeContentColor = 0xFF737373;
 
 namespace chrome {
 namespace android {
 
@@ skipping 38 matching lines @@
   }
 
   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();
 }
 
 ToolbarLayer::ToolbarLayer()
-    : layer_(cc::Layer::Create()),
-      bitmap_layer_(cc::UIResourceLayer::Create()),
-      progress_layer_(cc::UIResourceLayer::Create()),
-      anonymize_layer_(cc::SolidColorLayer::Create()),
-      debug_layer_(cc::SolidColorLayer::Create()) {
+    : layer_(cc::Layer::Create(content::Compositor::LayerSettings())),
+      bitmap_layer_(
+          cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
+      progress_layer_(
+          cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
+      anonymize_layer_(
+          cc::SolidColorLayer::Create(content::Compositor::LayerSettings())),
+      debug_layer_(
+          cc::SolidColorLayer::Create(content::Compositor::LayerSettings())) {
   bitmap_layer_->SetIsDrawable(true);
   layer_->AddChild(bitmap_layer_);
 
   progress_layer_->SetIsDrawable(true);
   progress_layer_->SetHideLayerAndSubtree(true);
   layer_->AddChild(progress_layer_);
 
   anonymize_layer_->SetHideLayerAndSubtree(true);
   anonymize_layer_->SetIsDrawable(true);
   anonymize_layer_->SetBackgroundColor(kNormalAnonymizeContentColor);
   layer_->AddChild(anonymize_layer_);
 
   debug_layer_->SetIsDrawable(true);
   debug_layer_->SetBackgroundColor(SK_ColorGREEN);
   debug_layer_->SetOpacity(0.5f);
 }
 
 ToolbarLayer::~ToolbarLayer() {
 }
 
 }  //  namespace android
 }  //  namespace chrome