android: move overscroll effects to ui/

ui/android/edge_effect.cc

 // Copyright (c) 2013 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/edge_effect.h"
+#include "ui/android/edge_effect.h"
 
 #include "cc/layers/layer.h"
 #include "cc/layers/ui_resource_layer.h"
-#include "content/browser/android/animation_utils.h"
-#include "content/public/browser/android/compositor.h"
+#include "ui/android/animation_utils.h"
 #include "ui/android/resources/resource_manager.h"
 #include "ui/android/resources/system_ui_resource_type.h"
+#include "ui/android/window_android_compositor.h"
 
-namespace content {
+namespace ui {
 
 namespace {
 
 const ui::SystemUIResourceType kEdgeResourceId = ui::OVERSCROLL_EDGE;
 const ui::SystemUIResourceType kGlowResourceId = ui::OVERSCROLL_GLOW;
 
 // Time it will take the effect to fully recede in ms
 const int kRecedeTimeMs = 1000;
 
 // Time it will take before a pulled glow begins receding in ms
@@ skipping 32 matching lines @@
 
 const float kEdgeHeightAtMdpi = 12.f;
 const float kGlowHeightAtMdpi = 128.f;
 
 }  // namespace
 
 class EdgeEffect::EffectLayer {
  public:
   EffectLayer(ui::SystemUIResourceType resource_type,
               ui::ResourceManager* resource_manager)
-      : ui_resource_layer_(
-            cc::UIResourceLayer::Create(Compositor::LayerSettings())),
+      : ui_resource_layer_(cc::UIResourceLayer::Create(
+            WindowAndroidCompositor::LayerSettings())),
         resource_type_(resource_type),
         resource_manager_(resource_manager) {}
 
   ~EffectLayer() { ui_resource_layer_->RemoveFromParent(); }
 
   void SetParent(cc::Layer* parent) {
     if (ui_resource_layer_->parent() != parent)
       parent->AddChild(ui_resource_layer_);
   }
 
@@ skipping 271 matching lines @@
 
 // static
 void EdgeEffect::PreloadResources(ui::ResourceManager* resource_manager) {
   DCHECK(resource_manager);
   resource_manager->PreloadResource(ui::ANDROID_RESOURCE_TYPE_SYSTEM,
                                     kEdgeResourceId);
   resource_manager->PreloadResource(ui::ANDROID_RESOURCE_TYPE_SYSTEM,
                                     kGlowResourceId);
 }
 
-}  // namespace content
+}  // namespace ui