CC Animation: Erase old animation system in Android Compositor.

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/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 "chrome/browser/android/compositor/layer/crushed_sprite_layer.h"
 #include "content/public/browser/android/compositor.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/android/resources/crushed_sprite_resource.h"
 #include "ui/android/resources/resource_manager.h"
@@ skipping 381 matching lines @@
 
     if (progress_bar_.get() && progress_bar_->parent())
       progress_bar_->RemoveFromParent();
   }
 }
 
 ContextualSearchLayer::ContextualSearchLayer(
     ui::ResourceManager* resource_manager)
     : OverlayPanelLayer(resource_manager),
       search_context_(
-          cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
+          cc::UIResourceLayer::Create(cc::LayerSettings())),
       search_provider_icon_sprite_(CrushedSpriteLayer::Create()),
       arrow_icon_(
-          cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
+          cc::UIResourceLayer::Create(cc::LayerSettings())),
       search_promo_(
-          cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
+          cc::UIResourceLayer::Create(cc::LayerSettings())),
       search_promo_container_(
-          cc::SolidColorLayer::Create(content::Compositor::LayerSettings())),
+          cc::SolidColorLayer::Create(cc::LayerSettings())),
       peek_promo_container_(
-          cc::SolidColorLayer::Create(content::Compositor::LayerSettings())),
+          cc::SolidColorLayer::Create(cc::LayerSettings())),
       peek_promo_ripple_(
-          cc::NinePatchLayer::Create(content::Compositor::LayerSettings())),
+          cc::NinePatchLayer::Create(cc::LayerSettings())),
       peek_promo_text_(
-          cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
+          cc::UIResourceLayer::Create(cc::LayerSettings())),
       progress_bar_(
-          cc::NinePatchLayer::Create(content::Compositor::LayerSettings())),
+          cc::NinePatchLayer::Create(cc::LayerSettings())),
       progress_bar_background_(
-          cc::NinePatchLayer::Create(content::Compositor::LayerSettings())) {
+          cc::NinePatchLayer::Create(cc::LayerSettings())) {
   // Search Peek Promo
   peek_promo_container_->SetIsDrawable(true);
   peek_promo_container_->SetBackgroundColor(kSearchBarBackgroundColor);
   peek_promo_ripple_->SetIsDrawable(true);
   peek_promo_ripple_->SetFillCenter(true);
   peek_promo_text_->SetIsDrawable(true);
   peek_promo_container_->AddChild(peek_promo_ripple_);
   peek_promo_container_->AddChild(peek_promo_text_);
 
   // Search Bar Text
@@ skipping 17 matching lines @@
   // Progress Bar
   progress_bar_->SetIsDrawable(true);
   progress_bar_->SetFillCenter(true);
 }
 
 ContextualSearchLayer::~ContextualSearchLayer() {
 }
 
 }  //  namespace android
 }  //  namespace chrome