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

Unified Diff: content/browser/web_contents/web_contents_view_aura.cc

Issue 12036074: overscroll: Enable overscroll navigation by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge Created 7 years, 11 months 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/web_contents/web_contents_view_aura.cc
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index ba30cc4b80d32e5aa106bec3e5ededbbf63600d2..668f3c6bfab52b780c15bdd76d396f0bf08c9c9c 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -716,12 +716,8 @@ gfx::Vector2d WebContentsViewAura::GetTranslationForOverscroll(int delta_x,
int delta_y) {
if (current_overscroll_gesture_ == OVERSCROLL_NORTH ||
current_overscroll_gesture_ == OVERSCROLL_SOUTH) {
- // For vertical overscroll, always do a resisted drag.
- const float threshold = GetOverscrollConfig(
- OVERSCROLL_CONFIG_VERT_RESIST_AFTER);
- int scroll = GetResistedScrollAmount(abs(delta_y),
- static_cast<int>(threshold));
- return gfx::Vector2d(0, delta_y < 0 ? -scroll : scroll);
+ // Ignore vertical overscroll.
+ return gfx::Vector2d();
}
// For horizontal overscroll, scroll freely if a navigation is possible. Do a
@@ -830,8 +826,9 @@ RenderWidgetHostView* WebContentsViewAura::CreateViewForWidget(
RenderWidgetHostImpl* host_impl =
RenderWidgetHostImpl::From(render_widget_host);
- if (host_impl->overscroll_controller() && web_contents_->GetDelegate() &&
- web_contents_->GetDelegate()->CanOverscrollContent()) {
+ if (host_impl->overscroll_controller() &&
+ (!web_contents_->GetDelegate() ||
+ web_contents_->GetDelegate()->CanOverscrollContent())) {
host_impl->overscroll_controller()->set_delegate(this);
if (!navigation_overlay_.get())
navigation_overlay_.reset(new OverscrollNavigationOverlay());

Powered by Google App Engine
This is Rietveld 408576698