Index: content/browser/android/overscroll_controller_android.cc |
diff --git a/content/browser/android/overscroll_controller_android.cc b/content/browser/android/overscroll_controller_android.cc |
index a65523a94af75a3cffff60b552d0d362021bab97..eecc0d8ef47dc83293df8382f4f594aa5f8efc80 100644 |
--- a/content/browser/android/overscroll_controller_android.cc |
+++ b/content/browser/android/overscroll_controller_android.cc |
@@ -14,6 +14,7 @@ |
#include "content/common/input/did_overscroll_params.h" |
#include "content/public/common/content_switches.h" |
#include "third_party/WebKit/public/web/WebInputEvent.h" |
+#include "ui/android/resources/resource_manager.h" |
#include "ui/base/android/window_android_compositor.h" |
namespace content { |
@@ -27,7 +28,7 @@ const int kAndroidLSDKVersion = 21; |
const int kDefaultRefreshDragTargetDips = 64; |
scoped_ptr<EdgeEffectBase> CreateGlowEdgeEffect( |
- ui::SystemUIResourceManager* resource_manager, |
+ ui::ResourceManager* resource_manager, |
float dpi_scale) { |
DCHECK(resource_manager); |
static bool use_l_flavoured_effect = |
@@ -59,7 +60,7 @@ scoped_ptr<OverscrollRefresh> CreateRefreshEffect( |
} |
return make_scoped_ptr( |
- new OverscrollRefresh(&compositor->GetSystemUIResourceManager(), client, |
+ new OverscrollRefresh(&compositor->GetResourceManager(), client, |
kDefaultRefreshDragTargetDips * dpi_scale)); |
} |
@@ -283,8 +284,7 @@ bool OverscrollControllerAndroid::IsStillRefreshing() const { |
} |
scoped_ptr<EdgeEffectBase> OverscrollControllerAndroid::CreateEdgeEffect() { |
- return CreateGlowEdgeEffect(&compositor_->GetSystemUIResourceManager(), |
- dpi_scale_); |
+ return CreateGlowEdgeEffect(&compositor_->GetResourceManager(), dpi_scale_); |
} |
void OverscrollControllerAndroid::SetNeedsAnimate() { |