CC Animation: Erase old animation system in Android Compositor.

content/browser/android/composited_touch_handle_drawable.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 "content/browser/android/composited_touch_handle_drawable.h"
 
 #include "base/android/context_utils.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/trace_event/trace_event.h"
+#include "cc/layers/layer_settings.h"
 #include "cc/layers/ui_resource_layer.h"
 #include "content/public/browser/android/compositor.h"
 #include "jni/HandleViewResources_jni.h"
 #include "ui/gfx/android/java_bitmap.h"
 
 namespace content {
 
 namespace {
 
 static SkBitmap CreateSkBitmapFromJavaBitmap(
@@ skipping 67 matching lines @@
 base::LazyInstance<HandleResources>::Leaky g_selection_resources;
 
 }  // namespace
 
 CompositedTouchHandleDrawable::CompositedTouchHandleDrawable(
     cc::Layer* root_layer,
     float dpi_scale,
     jobject context)
     : dpi_scale_(dpi_scale),
       orientation_(ui::TouchHandleOrientation::UNDEFINED),
-      layer_(cc::UIResourceLayer::Create(Compositor::LayerSettings())) {
+      layer_(cc::UIResourceLayer::Create(cc::LayerSettings())) {
   g_selection_resources.Get().LoadIfNecessary(context);
   drawable_horizontal_padding_ratio_ =
       g_selection_resources.Get().GetDrawableHorizontalPaddingRatio();
   DCHECK(root_layer);
   root_layer->AddChild(layer_.get());
 }
 
 CompositedTouchHandleDrawable::~CompositedTouchHandleDrawable() {
   DetachLayer();
 }
@@ skipping 68 matching lines @@
 void CompositedTouchHandleDrawable::UpdateLayerPosition() {
   layer_->SetPosition(origin_position_);
 }
 
 // static
 bool CompositedTouchHandleDrawable::RegisterHandleViewResources(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content