Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(446)

Unified Diff: content/browser/android/overscroll_controller_android.cc

Issue 755643004: Replace SystemUIResourceManager with ResourceManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix clang build failure Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/android/edge_effect_l.cc ('k') | content/browser/android/overscroll_refresh.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 09a33f68020ef6b636bc194d2b57c35388858154..0f161d8fdd9d4395df71efb64c03ae00cb29a032 100644
--- a/content/browser/android/overscroll_controller_android.cc
+++ b/content/browser/android/overscroll_controller_android.cc
@@ -15,6 +15,7 @@
#include "content/public/browser/navigation_controller.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 {
@@ -28,7 +29,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 =
@@ -60,7 +61,7 @@ scoped_ptr<OverscrollRefresh> CreateRefreshEffect(
}
return make_scoped_ptr(
- new OverscrollRefresh(&compositor->GetSystemUIResourceManager(), client,
+ new OverscrollRefresh(&compositor->GetResourceManager(), client,
kDefaultRefreshDragTargetDips * dpi_scale));
}
@@ -284,8 +285,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() {
« no previous file with comments | « content/browser/android/edge_effect_l.cc ('k') | content/browser/android/overscroll_refresh.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698