Index: content/browser/android/edge_effect.cc |
diff --git a/content/browser/android/edge_effect.cc b/content/browser/android/edge_effect.cc |
index 64248be57d3269ca28af89a46b3788aeb2f537ae..eed8af92d3bf0af1e9799586e80e571fed3a915c 100644 |
--- a/content/browser/android/edge_effect.cc |
+++ b/content/browser/android/edge_effect.cc |
@@ -7,7 +7,7 @@ |
#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 { |
@@ -58,7 +58,7 @@ const float kGlowHeightAtMdpi = 128.f; |
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) {} |
@@ -87,12 +87,12 @@ class EdgeEffect::EffectLayer { |
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)), |
@@ -335,8 +335,7 @@ void EdgeEffect::SetParent(cc::Layer* 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); |