Replace SystemUIResourceManager with ResourceManager

content/browser/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 "cc/layers/ui_resource_layer.h"
 #include "content/browser/android/animation_utils.h"
-#include "ui/base/android/system_ui_resource_manager.h"
+#include "ui/android/resources/resource_manager.h"
 
 namespace content {
 
 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;
@@ skipping 14 matching lines @@
 
 const float kSin = 0.5f;    // sin(PI / 6)
 const float kCos = 0.866f;  // cos(PI / 6);
 
 // How much dragging should effect the height of the glow image.
 // Number determined by user testing.
 const float kPullDistanceAlphaGlowFactor = 0.8f;
 
 const int kVelocityGlowFactor = 6;
 
-const ui::SystemUIResourceType kResourceType = ui::OVERSCROLL_GLOW_L;
+const ui::SystemUIResourceType kResourceId = ui::OVERSCROLL_GLOW_L;
 
 }  // namespace
 
-EdgeEffectL::EdgeEffectL(ui::SystemUIResourceManager* resource_manager)
+EdgeEffectL::EdgeEffectL(ui::ResourceManager* resource_manager)
     : resource_manager_(resource_manager),
       glow_(cc::UIResourceLayer::Create()),
       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),
@@ skipping 168 matching lines @@
   const float h = r - y;
   const float o_r = size.height() * 0.75f / kSin;
   const float o_y = kCos * o_r;
   const float o_h = o_r - o_y;
   const float base_glow_scale = h > 0.f ? std::min(o_h / h, 1.f) : 1.f;
   bounds_ = gfx::Size(size.width(), (int)std::min(size.height(), h));
   gfx::Size image_bounds(
       r, std::min(1.f, glow_scale_y_) * base_glow_scale * bounds_.height());
 
   glow_->SetIsDrawable(true);
-  glow_->SetUIResourceId(resource_manager_->GetUIResourceId(kResourceType));
+  glow_->SetUIResourceId(resource_manager_->GetUIResourceId(
+      ui::ANDROID_RESOURCE_TYPE_SYSTEM, kResourceId));
   glow_->SetTransformOrigin(gfx::Point3F(bounds_.width() * 0.5f, 0, 0));
   glow_->SetBounds(image_bounds);
   glow_->SetContentsOpaque(false);
   glow_->SetOpacity(Clamp(glow_alpha_, 0.f, 1.f));
 
   const float displacement = Clamp(displacement_, 0.f, 1.f) - 0.5f;
   const float displacement_offset_x = bounds_.width() * displacement * 0.5f;
   const float image_offset_x = (bounds_.width() - image_bounds.width()) * 0.5f;
   gfx::Transform offset_transform;
   offset_transform.Translate(image_offset_x - displacement_offset_x, 0);
   offset_transform.ConcatTransform(transform);
   glow_->SetTransform(offset_transform);
 }
 
 void EdgeEffectL::SetParent(cc::Layer* parent) {
   if (glow_->parent() != parent)
     parent->AddChild(glow_);
 }
 
 // static
-void EdgeEffectL::PreloadResources(
-    ui::SystemUIResourceManager* resource_manager) {
+void EdgeEffectL::PreloadResources(ui::ResourceManager* resource_manager) {
   DCHECK(resource_manager);
-  resource_manager->PreloadResource(kResourceType);
+  resource_manager->PreloadResource(ui::ANDROID_RESOURCE_TYPE_SYSTEM,
+                                    kResourceId);
 }
 
 }  // namespace content