content/browser/renderer_host/render_widget_host_view_android.cc - Issue 733293002: [Android] Add a flag to disable the pull-to-refresh effect

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/render_widget_host_view_android.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: 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

« content/browser/android/overscroll_controller_android.cc ('K') | « content/browser/renderer_host/render_widget_host_view_android.h ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_android.cc

diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc

index 10b20780722b4f83f2a24bcb9d2243cdfb3b39ac..c5faff470006bc1636bcb42aedb688a960719164 100644

--- a/content/browser/renderer_host/render_widget_host_view_android.cc

+++ b/content/browser/renderer_host/render_widget_host_view_android.cc

@@ -217,9 +217,6 @@ RenderWidgetHostViewAndroid::RenderWidgetHostViewAndroid(

ime_adapter_android_(this),

cached_background_color_(SK_ColorWHITE),

last_output_surface_id_(kUndefinedOutputSurfaceId),

- overscroll_controller_enabled_(

- !base::CommandLine::ForCurrentProcess()->HasSwitch(

- switches::kDisableOverscrollEdgeEffect)),

gesture_provider_(CreateGestureProviderConfig(), this),

gesture_text_selector_(this),

accelerated_surface_route_id_(0),

@@ -1551,7 +1548,7 @@ void RenderWidgetHostViewAndroid::SetContentViewCore(

if (!selection_controller_)

selection_controller_ = CreateSelectionController(this, content_view_core_);

- if (overscroll_controller_enabled_ && !overscroll_controller_ &&

+ if (!overscroll_controller_ &&

jdduke (slow) 2014/11/18 22:57:49 I considered moving |overscroll_controller_| to Co

content_view_core_->GetWindowAndroid()->GetCompositor()) {

overscroll_controller_ = CreateOverscrollController(content_view_core_);

}

@@ -1575,7 +1572,7 @@ void RenderWidgetHostViewAndroid::OnCompositingDidCommit() {

void RenderWidgetHostViewAndroid::OnAttachCompositor() {

DCHECK(content_view_core_);

- if (overscroll_controller_enabled_ && !overscroll_controller_)

+ if (!overscroll_controller_)

overscroll_controller_ = CreateOverscrollController(content_view_core_);

}