CC Animations: Make LayerAnimationController creation optional

chrome/browser/android/compositor/decoration_title.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/decoration_title.h"
 
 #include <android/bitmap.h>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/ui_resource_layer.h"
+#include "chrome/browser/android/compositor/layer/content_layer.h"
 #include "chrome/browser/android/compositor/layer_title_cache.h"
 #include "ui/android/resources/resource_manager.h"
 #include "ui/android/resources/ui_resource_android.h"
 #include "ui/base/l10n/l10n_util_android.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/geometry/vector3d_f.h"
 
 namespace chrome {
 namespace android {
 
 DecorationTitle::DecorationTitle(LayerTitleCache* layer_title_cache,
                                  ui::ResourceManager* resource_manager,
                                  int title_resource_id,
                                  int favicon_resource_id,
                                  int spinner_resource_id,
                                  int spinner_incognito_resource_id,
                                  int fade_width,
                                  int favicon_start_padding,
                                  int favicon_end_padding,
                                  bool is_incognito,
                                  bool is_rtl)
-    : layer_(cc::Layer::Create()),
-      layer_opaque_(cc::UIResourceLayer::Create()),
-      layer_fade_(cc::UIResourceLayer::Create()),
-      layer_favicon_(cc::UIResourceLayer::Create()),
+    : layer_(cc::Layer::Create(ContentLayer::ContentLayerSettings())),
+      layer_opaque_(
+          cc::UIResourceLayer::Create(ContentLayer::ContentLayerSettings())),
+      layer_fade_(
+          cc::UIResourceLayer::Create(ContentLayer::ContentLayerSettings())),
+      layer_favicon_(
+          cc::UIResourceLayer::Create(ContentLayer::ContentLayerSettings())),
       title_resource_id_(title_resource_id),
       favicon_resource_id_(favicon_resource_id),
       spinner_resource_id_(spinner_resource_id),
       spinner_incognito_resource_id_(spinner_resource_id),
       fade_width_(fade_width),
       spinner_rotation_(0),
       favicon_start_padding_(favicon_start_padding),
       favicon_end_padding_(favicon_end_padding),
       is_incognito_(is_incognito),
       is_rtl_(is_rtl),
@@ skipping 186 matching lines @@
   }
 }
 
 scoped_refptr<cc::Layer> DecorationTitle::layer() {
   DCHECK(layer_.get());
   return layer_;
 }
 
 }  // namespace android
 }  // namespace chrome