| Index: content/browser/android/edge_effect_l.cc
|
| diff --git a/content/browser/android/edge_effect_l.cc b/content/browser/android/edge_effect_l.cc
|
| index 37f1cacdd02064b294f50562c92a77308097ede4..d4d996db07308722122b0595bf5c9f9db90594b1 100644
|
| --- a/content/browser/android/edge_effect_l.cc
|
| +++ b/content/browser/android/edge_effect_l.cc
|
| @@ -6,7 +6,7 @@
|
|
|
| #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 {
|
|
|
| @@ -45,7 +45,7 @@ const ui::SystemUIResourceType kResourceType = 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),
|
| @@ -255,8 +255,7 @@ void EdgeEffectL::SetParent(cc::Layer* parent) {
|
| }
|
|
|
| // static
|
| -void EdgeEffectL::PreloadResources(
|
| - ui::SystemUIResourceManager* resource_manager) {
|
| +void EdgeEffectL::PreloadResources(ui::ResourceManager* resource_manager) {
|
| DCHECK(resource_manager);
|
| resource_manager->PreloadResource(kResourceType);
|
| }
|
|
|