chrome/browser/renderer_host/render_widget_host_view_views.h - Issue 7618036: mac: Only let two-finger-scrolling trigger history if web doesn't swallow gesture

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: chrome/browser/renderer_host/render_widget_host_view_views.h

Issue 7618036: mac: Only let two-finger-scrolling trigger history if web doesn't swallow gesture (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: TestRenderViewHost Created 9 years, 4 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

« no previous file with comments | « chrome/browser/renderer_host/render_widget_host_view_mac.mm ('k') | chrome/browser/renderer_host/render_widget_host_view_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/renderer_host/render_widget_host_view_views.h

diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.h b/chrome/browser/renderer_host/render_widget_host_view_views.h

index 715c6b72265fb9e575b00fdae47a2c50731bfaea..aeb60fa0ed573ffd047b01596313ef77a717c981 100644

--- a/chrome/browser/renderer_host/render_widget_host_view_views.h

+++ b/chrome/browser/renderer_host/render_widget_host_view_views.h

@@ -92,6 +92,12 @@ class RenderWidgetHostViewViews : public RenderWidgetHostView,

#endif

virtual void SetVisuallyDeemphasized(const SkColor* color,

bool animate) OVERRIDE;

+ virtual void UnhandledWheelEvent(

+ const WebKit::WebMouseWheelEvent& event) OVERRIDE;

+ virtual void SetHasHorizontalScrollbar(

+ bool has_horizontal_scrollbar) OVERRIDE;

+ virtual void SetScrollOffsetPinning(

+ bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE;

#if defined(TOOLKIT_USES_GTK)

virtual void AcceleratedCompositingActivated(bool activated) OVERRIDE;

#endif