CC Animations: Make LayerAnimationController creation optional

chrome/browser/android/compositor/layer/contextual_search_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/contextual_search_layer.h"
 
 #include "cc/layers/layer.h"
 #include "cc/layers/nine_patch_layer.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/ui_resource_layer.h"
+#include "chrome/browser/android/compositor/layer/content_layer.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/android/resources/resource_manager.h"
 #include "ui/android/resources/ui_resource_android.h"
 
 namespace {
 
 const SkColor kSearchBackgroundColor = SkColorSetRGB(0xee, 0xee, 0xee);
 const SkColor kSearchBarBorderColor = SkColorSetRGB(0xf1, 0xf1, 0xf1);
 
@@ skipping 266 matching lines @@
     search_bar_border_->SetPosition(gfx::PointF(0.f, search_bar_border_y));
     layer_->AddChild(search_bar_border_);
   } else if (search_bar_border_.get() && search_bar_border_->parent()) {
     search_bar_border_->RemoveFromParent();
   }
 }
 
 ContextualSearchLayer::ContextualSearchLayer(
     ui::ResourceManager* resource_manager)
     : resource_manager_(resource_manager),
-      layer_(cc::Layer::Create()),
-      search_bar_background_(cc::NinePatchLayer::Create()),
-      search_bar_text_(cc::UIResourceLayer::Create()),
-      search_bar_shadow_(cc::UIResourceLayer::Create()),
-      search_provider_icon_(cc::UIResourceLayer::Create()),
-      search_icon_(cc::UIResourceLayer::Create()),
-      content_view_container_(cc::Layer::Create()),
-      search_bar_border_(cc::SolidColorLayer::Create()),
-      progress_bar_(cc::NinePatchLayer::Create()),
-      progress_bar_background_(cc::NinePatchLayer::Create()),
-      search_promo_(cc::UIResourceLayer::Create()),
-      search_promo_container_(cc::SolidColorLayer::Create()) {
+      layer_(cc::Layer::Create(ContentLayer::ContentLayerSettings())),
+      search_bar_background_(
+          cc::NinePatchLayer::Create(ContentLayer::ContentLayerSettings())),
+      search_bar_text_(
+          cc::UIResourceLayer::Create(ContentLayer::ContentLayerSettings())),
+      search_bar_shadow_(
+          cc::UIResourceLayer::Create(ContentLayer::ContentLayerSettings())),
+      search_provider_icon_(
+          cc::UIResourceLayer::Create(ContentLayer::ContentLayerSettings())),
+      search_icon_(
+          cc::UIResourceLayer::Create(ContentLayer::ContentLayerSettings())),
+      content_view_container_(
+          cc::Layer::Create(ContentLayer::ContentLayerSettings())),
+      search_bar_border_(
+          cc::SolidColorLayer::Create(ContentLayer::ContentLayerSettings())),
+      progress_bar_(
+          cc::NinePatchLayer::Create(ContentLayer::ContentLayerSettings())),
+      progress_bar_background_(
+          cc::NinePatchLayer::Create(ContentLayer::ContentLayerSettings())),
+      search_promo_(
+          cc::UIResourceLayer::Create(ContentLayer::ContentLayerSettings())),
+      search_promo_container_(
+          cc::SolidColorLayer::Create(ContentLayer::ContentLayerSettings())) {
   layer_->SetMasksToBounds(false);
   layer_->SetIsDrawable(true);
 
   // Search Bar Background
   search_bar_background_->SetIsDrawable(true);
   search_bar_background_->SetFillCenter(true);
   layer_->AddChild(search_bar_background_);
 
   // Search Bar Text
   search_bar_text_->SetIsDrawable(true);
@@ skipping 33 matching lines @@
 
 ContextualSearchLayer::~ContextualSearchLayer() {
 }
 
 scoped_refptr<cc::Layer> ContextualSearchLayer::layer() {
   return layer_;
 }
 
 }  //  namespace android
 }  //  namespace chrome