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

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

Issue 748433002: [Android] Isolate OverscrollRefresh from device density (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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_refresh.cc
diff --git a/content/browser/android/overscroll_refresh.cc b/content/browser/android/overscroll_refresh.cc
index 219749a0a3cd4e2523468993824549f1f2711695..c57a657b59fcfe096e276e9e4e43a5c978d68281 100644
--- a/content/browser/android/overscroll_refresh.cc
+++ b/content/browser/android/overscroll_refresh.cc
@@ -8,7 +8,6 @@
#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/gfx/screen.h"
using std::abs;
using std::max;
@@ -21,10 +20,6 @@ const ui::SystemUIResourceType kIdleResourceType = ui::OVERSCROLL_REFRESH_IDLE;
const ui::SystemUIResourceType kActiveResourceType =
ui::OVERSCROLL_REFRESH_ACTIVE;
-// Default offset in dips from the top of the view to where the progress spinner
-// should stop.
-const int kDefaultSpinnerTargetDips = 64;
-
// Drag movement multiplier between user input and effect translation.
const float kDragRate = .5f;
@@ -111,14 +106,11 @@ void UpdateLayer(cc::UIResourceLayer* layer,
class OverscrollRefresh::Effect {
public:
- Effect(ui::SystemUIResourceManager* resource_manager)
+ Effect(ui::SystemUIResourceManager* resource_manager, float target_drag)
: resource_manager_(resource_manager),
idle_layer_(cc::UIResourceLayer::Create()),
active_layer_(cc::UIResourceLayer::Create()),
- target_drag_(kDefaultSpinnerTargetDips *
- gfx::Screen::GetNativeScreen()
- ->GetPrimaryDisplay()
- .device_scale_factor()),
+ target_drag_(target_drag),
drag_(0),
idle_alpha_(0),
active_alpha_(0),
@@ -361,11 +353,12 @@ class OverscrollRefresh::Effect {
OverscrollRefresh::OverscrollRefresh(
ui::SystemUIResourceManager* resource_manager,
- OverscrollRefreshClient* client)
+ OverscrollRefreshClient* client,
+ float target_drag_offset_pixels)
: client_(client),
scrolled_to_top_(true),
scroll_consumption_state_(DISABLED),
- effect_(new Effect(resource_manager)) {
+ effect_(new Effect(resource_manager, target_drag_offset_pixels)) {
DCHECK(client);
}
« no previous file with comments | « content/browser/android/overscroll_refresh.h ('k') | content/browser/android/overscroll_refresh_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698