Replace SystemUIResourceManager with ResourceManager

content/browser/android/overscroll_refresh.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/overscroll_refresh.h"
 
 #include "cc/animation/timing_function.h"
 #include "cc/layers/ui_resource_layer.h"
 #include "cc/trees/layer_tree_host.h"
 #include "content/browser/android/animation_utils.h"
-#include "ui/base/android/system_ui_resource_manager.h"
+#include "ui/android/resources/resource_manager.h"
 #include "ui/gfx/geometry/size_conversions.h"
 
 using std::abs;
 using std::max;
 using std::min;
 
 namespace content {
 namespace {
 
-const ui::SystemUIResourceType kIdleResourceType = ui::OVERSCROLL_REFRESH_IDLE;
-const ui::SystemUIResourceType kActiveResourceType =
+const ui::SystemUIResourceType kIdleResourceId = ui::OVERSCROLL_REFRESH_IDLE;
+const ui::SystemUIResourceType kActiveResourceId =
     ui::OVERSCROLL_REFRESH_ACTIVE;
 
 // Drag movement multiplier between user input and effect translation.
 const float kDragRate = .5f;
 
 // Animation duration after the effect is released without triggering a refresh.
 const int kRecedeTimeMs = 300;
 
 // Animation duration immediately after the effect is released and activated.
 const int kActivationStartTimeMs = 150;
@@ skipping 65 matching lines @@
   gfx::Transform transform;
   transform.Translate(offset_x, offset_y);
   transform.Rotate(rotation);
   layer->SetTransform(transform);
 }
 
 }  // namespace
 
 class OverscrollRefresh::Effect {
  public:
-  Effect(ui::SystemUIResourceManager* resource_manager, float target_drag)
+  Effect(ui::ResourceManager* resource_manager, float target_drag)
       : resource_manager_(resource_manager),
         idle_layer_(cc::UIResourceLayer::Create()),
         active_layer_(cc::UIResourceLayer::Create()),
         target_drag_(target_drag),
         drag_(0),
         idle_alpha_(0),
         active_alpha_(0),
         offset_(0),
         rotation_(0),
         size_scale_(1),
@@ skipping 199 matching lines @@
       return;
 
     // An empty window size, while meaningless, is also relatively harmless, and
     // will simply prevent any drawing of the layers.
     if (viewport_size.IsEmpty()) {
       idle_layer_->SetIsDrawable(false);
       active_layer_->SetIsDrawable(false);
       return;
     }
 
-    cc::UIResourceId idle_resource =
-        resource_manager_->GetUIResourceId(kIdleResourceType);
-    cc::UIResourceId active_resource =
-        resource_manager_->GetUIResourceId(kActiveResourceType);
+    cc::UIResourceId idle_resource = resource_manager_->GetUIResourceId(
+        ui::ANDROID_RESOURCE_TYPE_SYSTEM, kIdleResourceId);
+    cc::UIResourceId active_resource = resource_manager_->GetUIResourceId(
+        ui::ANDROID_RESOURCE_TYPE_SYSTEM, kActiveResourceId);
 
     gfx::Size idle_size =
         parent->layer_tree_host()->GetUIResourceSize(idle_resource);
     gfx::Size active_size =
         parent->layer_tree_host()->GetUIResourceSize(active_resource);
     gfx::Size scaled_idle_size =
         gfx::ToRoundedSize(gfx::ScaleSize(idle_size, size_scale_));
     gfx::Size scaled_active_size =
         gfx::ToRoundedSize(gfx::ScaleSize(active_size, size_scale_));
 
@@ skipping 18 matching lines @@
     STATE_ACTIVATED,
     STATE_ACTIVATED_RECEDE,
     STATE_RECEDE
   };
 
   void Detach() {
     idle_layer_->RemoveFromParent();
     active_layer_->RemoveFromParent();
   }
 
-  ui::SystemUIResourceManager* const resource_manager_;
+  ui::ResourceManager* const resource_manager_;
 
   scoped_refptr<cc::UIResourceLayer> idle_layer_;
   scoped_refptr<cc::UIResourceLayer> active_layer_;
 
   const float target_drag_;
   float drag_;
   float idle_alpha_;
   float active_alpha_;
   float offset_;
   float rotation_;
@@ skipping 15 matching lines @@
   base::TimeDelta duration_;
 
   State state_;
 
   scoped_ptr<cc::TimingFunction> ease_out_;
   scoped_ptr<cc::TimingFunction> ease_in_out_;
 
   DISALLOW_COPY_AND_ASSIGN(Effect);
 };
 
-OverscrollRefresh::OverscrollRefresh(
-    ui::SystemUIResourceManager* resource_manager,
-    OverscrollRefreshClient* client,
-    float target_drag_offset_pixels)
+OverscrollRefresh::OverscrollRefresh(ui::ResourceManager* resource_manager,
+                                     OverscrollRefreshClient* client,
+                                     float target_drag_offset_pixels)
     : client_(client),
       scrolled_to_top_(true),
       scroll_consumption_state_(DISABLED),
       effect_(new Effect(resource_manager, target_drag_offset_pixels)) {
   DCHECK(client);
 }
 
 OverscrollRefresh::~OverscrollRefresh() {
 }
 
@@ skipping 79 matching lines @@
 
 void OverscrollRefresh::Release(bool allow_activation) {
   if (scroll_consumption_state_ == ENABLED) {
     if (effect_->Release(base::TimeTicks::Now(), allow_activation))
       client_->TriggerRefresh();
   }
   scroll_consumption_state_ = DISABLED;
 }
 
 }  // namespace content