CC Animation: Erase old animation system in Android Compositor.

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/layer_settings.h"
 #include "cc/layers/nine_patch_layer.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/ui_resource_layer.h"
 #include "cc/resources/scoped_ui_resource.h"
 #include "content/public/browser/android/compositor.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/android/resources/resource_manager.h"
 
 namespace chrome {
 namespace android {
@@ skipping 125 matching lines @@
     progress_bar_layer_->SetPosition(
         gfx::PointF(progress_bar_x, progress_bar_y));
     progress_bar_layer_->SetBounds(
         gfx::Size(progress_bar_width, progress_bar_height));
     progress_bar_layer_->SetBackgroundColor(progress_bar_color);
   }
 }
 
 ToolbarLayer::ToolbarLayer(ui::ResourceManager* resource_manager)
     : resource_manager_(resource_manager),
-      layer_(cc::Layer::Create(content::Compositor::LayerSettings())),
+      layer_(cc::Layer::Create(cc::LayerSettings())),
       toolbar_background_layer_(
-          cc::SolidColorLayer::Create(content::Compositor::LayerSettings())),
+          cc::SolidColorLayer::Create(cc::LayerSettings())),
       url_bar_background_layer_(
-          cc::NinePatchLayer::Create(content::Compositor::LayerSettings())),
+          cc::NinePatchLayer::Create(cc::LayerSettings())),
       bitmap_layer_(
-          cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
+          cc::UIResourceLayer::Create(cc::LayerSettings())),
       progress_bar_layer_(
-          cc::SolidColorLayer::Create(content::Compositor::LayerSettings())),
+          cc::SolidColorLayer::Create(cc::LayerSettings())),
       progress_bar_background_layer_(
-          cc::SolidColorLayer::Create(content::Compositor::LayerSettings())),
+          cc::SolidColorLayer::Create(cc::LayerSettings())),
       anonymize_layer_(
-          cc::SolidColorLayer::Create(content::Compositor::LayerSettings())),
+          cc::SolidColorLayer::Create(cc::LayerSettings())),
       debug_layer_(
-          cc::SolidColorLayer::Create(content::Compositor::LayerSettings())),
+          cc::SolidColorLayer::Create(cc::LayerSettings())),
       brightness_(1.f) {
   toolbar_background_layer_->SetIsDrawable(true);
   layer_->AddChild(toolbar_background_layer_);
 
   url_bar_background_layer_->SetIsDrawable(true);
   url_bar_background_layer_->SetFillCenter(true);
   layer_->AddChild(url_bar_background_layer_);
 
   bitmap_layer_->SetIsDrawable(true);
   layer_->AddChild(bitmap_layer_);
@@ skipping 13 matching lines @@
   debug_layer_->SetIsDrawable(true);
   debug_layer_->SetBackgroundColor(SK_ColorGREEN);
   debug_layer_->SetOpacity(0.5f);
 }
 
 ToolbarLayer::~ToolbarLayer() {
 }
 
 }  //  namespace android
 }  //  namespace chrome