Index: content/browser/android/overscroll_refresh.cc |
diff --git a/content/browser/android/overscroll_refresh.cc b/content/browser/android/overscroll_refresh.cc |
index 6d0ed1671e9d3861471fc0a48fbf4cab55721a26..5529a88fa9c310ce47b213fcd5d2c24b178d61ec 100644 |
--- a/content/browser/android/overscroll_refresh.cc |
+++ b/content/browser/android/overscroll_refresh.cc |
@@ -8,7 +8,7 @@ |
#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; |
@@ -105,7 +105,7 @@ void UpdateLayer(cc::UIResourceLayer* layer, |
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()), |
@@ -367,7 +367,7 @@ class OverscrollRefresh::Effect { |
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_; |
@@ -403,10 +403,9 @@ class OverscrollRefresh::Effect { |
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), |