android: move overscroll effects to ui/

ui/android/edge_effect_l.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/edge_effect_l.h"
+#include "ui/android/edge_effect_l.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"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/geometry/size_conversions.h"
 
-namespace content {
+namespace ui {
 
 namespace {
 
 // Time it will take the effect to fully recede in ms
 const int kRecedeTimeMs = 600;
 
 // Time it will take before a pulled glow begins receding in ms
 const int kPullTimeMs = 167;
 
 // Time it will take for a pulled glow to decay to partial strength before
@@ skipping 18 matching lines @@
 const float kPullDistanceAlphaGlowFactor = 0.8f;
 
 const int kVelocityGlowFactor = 6;
 
 const ui::SystemUIResourceType kResourceId = ui::OVERSCROLL_GLOW_L;
 
 }  // namespace
 
 EdgeEffectL::EdgeEffectL(ui::ResourceManager* resource_manager)
     : resource_manager_(resource_manager),
-      glow_(cc::UIResourceLayer::Create(Compositor::LayerSettings())),
+      glow_(cc::UIResourceLayer::Create(
+          WindowAndroidCompositor::LayerSettings())),
       glow_alpha_(0),
       glow_scale_y_(0),
       glow_alpha_start_(0),
       glow_alpha_finish_(0),
       glow_scale_y_start_(0),
       glow_scale_y_finish_(0),
       displacement_(0.5f),
       target_displacement_(0.5f),
       state_(STATE_IDLE),
       pull_distance_(0) {
@@ skipping 226 matching lines @@
     parent->AddChild(glow_);
 }
 
 // static
 void EdgeEffectL::PreloadResources(ui::ResourceManager* resource_manager) {
   DCHECK(resource_manager);
   resource_manager->PreloadResource(ui::ANDROID_RESOURCE_TYPE_SYSTEM,
                                     kResourceId);
 }
 
-}  // namespace content
+}  // namespace ui