Replace SystemUIResourceManager with ResourceManager

content/browser/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 "cc/layers/layer.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 = 1000;
 
 // Time it will take before a pulled glow begins receding in ms
 const int kPullTimeMs = 167;
@@ skipping 30 matching lines @@
 const int kVelocityGlowFactor = 12;
 
 const float kEdgeHeightAtMdpi = 12.f;
 const float kGlowHeightAtMdpi = 128.f;
 
 }  // namespace
 
 class EdgeEffect::EffectLayer {
  public:
   EffectLayer(ui::SystemUIResourceType resource_type,
-              ui::SystemUIResourceManager* resource_manager)
+              ui::ResourceManager* resource_manager)
       : ui_resource_layer_(cc::UIResourceLayer::Create()),
         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_);
   }
 
   void Disable() { ui_resource_layer_->SetIsDrawable(false); }
 
   void Update(const gfx::Size& size,
               const gfx::Transform& transform,
               float opacity) {
-    ui_resource_layer_->SetUIResourceId(
-        resource_manager_->GetUIResourceId(resource_type_));
+    ui_resource_layer_->SetUIResourceId(resource_manager_->GetUIResourceId(
+        ui::ANDROID_RESOURCE_TYPE_SYSTEM, resource_type_));
     ui_resource_layer_->SetIsDrawable(true);
     ui_resource_layer_->SetTransformOrigin(
         gfx::Point3F(size.width() * 0.5f, 0, 0));
     ui_resource_layer_->SetTransform(transform);
     ui_resource_layer_->SetBounds(size);
     ui_resource_layer_->SetOpacity(Clamp(opacity, 0.f, 1.f));
   }
 
   scoped_refptr<cc::UIResourceLayer> ui_resource_layer_;
   ui::SystemUIResourceType resource_type_;
-  ui::SystemUIResourceManager* resource_manager_;
+  ui::ResourceManager* resource_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(EffectLayer);
 };
 
-EdgeEffect::EdgeEffect(ui::SystemUIResourceManager* resource_manager,
+EdgeEffect::EdgeEffect(ui::ResourceManager* resource_manager,
                        float device_scale_factor)
     : edge_(new EffectLayer(ui::OVERSCROLL_EDGE, resource_manager)),
       glow_(new EffectLayer(ui::OVERSCROLL_GLOW, resource_manager)),
       base_edge_height_(kEdgeHeightAtMdpi * device_scale_factor),
       base_glow_height_(kGlowHeightAtMdpi * device_scale_factor),
       edge_alpha_(0),
       edge_scale_y_(0),
       glow_alpha_(0),
       glow_scale_y_(0),
       edge_alpha_start_(0),
@@ skipping 222 matching lines @@
   const gfx::Size edge_size(size.width(), scaled_edge_height);
   edge_->Update(edge_size, transform, edge_alpha_);
 }
 
 void EdgeEffect::SetParent(cc::Layer* parent) {
   edge_->SetParent(parent);
   glow_->SetParent(parent);
 }
 
 // static
-void EdgeEffect::PreloadResources(
-    ui::SystemUIResourceManager* resource_manager) {
+void EdgeEffect::PreloadResources(ui::ResourceManager* resource_manager) {
   DCHECK(resource_manager);
-  resource_manager->PreloadResource(ui::OVERSCROLL_EDGE);
-  resource_manager->PreloadResource(ui::OVERSCROLL_GLOW);
+  resource_manager->PreloadResource(ui::ANDROID_RESOURCE_TYPE_SYSTEM,
+                                    ui::OVERSCROLL_EDGE);
+  resource_manager->PreloadResource(ui::ANDROID_RESOURCE_TYPE_SYSTEM,
+                                    ui::OVERSCROLL_GLOW);
 }
 
 }  // namespace content