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

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

Issue 733293002: [Android] Add a flag to disable the pull-to-refresh effect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 1 month 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
Index: content/browser/android/overscroll_glow.cc
diff --git a/content/browser/android/overscroll_glow.cc b/content/browser/android/overscroll_glow.cc
index a5355d4fd9fb606096bb49b10c86e7a36e084ec9..8985b6a5796fd4b5efc878ab7d2d37d7fa51963e 100644
--- a/content/browser/android/overscroll_glow.cc
+++ b/content/browser/android/overscroll_glow.cc
@@ -75,11 +75,9 @@ gfx::SizeF ComputeSize(OverscrollGlow::Edge edge,
} // namespace
-OverscrollGlow::OverscrollGlow(const EdgeEffectProvider& edge_effect_provider)
- : edge_effect_provider_(edge_effect_provider),
- edge_offsets_(),
- initialized_(false) {
- DCHECK(!edge_effect_provider_.is_null());
+OverscrollGlow::OverscrollGlow(OverscrollGlowClient* client)
+ : client_(client), edge_offsets_(), initialized_(false) {
+ DCHECK(client);
}
OverscrollGlow::~OverscrollGlow() {
@@ -206,7 +204,7 @@ bool OverscrollGlow::InitializeIfNecessary() {
DCHECK(!root_layer_.get());
root_layer_ = cc::Layer::Create();
for (size_t i = 0; i < EDGE_COUNT; ++i) {
- edge_effects_[i] = edge_effect_provider_.Run();
+ edge_effects_[i] = client_->CreateEdgeEffect();
DCHECK(edge_effects_[i]);
}
« no previous file with comments | « content/browser/android/overscroll_glow.h ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698