mac: History swiping doesn't work right with iframes.

content/public/browser/render_widget_host_view_mac_delegate.h

Index: content/public/browser/render_widget_host_view_mac_delegate.h
diff --git a/content/public/browser/render_widget_host_view_mac_delegate.h b/content/public/browser/render_widget_host_view_mac_delegate.h
index 06af8254b4eba20625b1d5408297b30ece11acec..30f935b24b04e1fbc798369ccffb4938db60afe9 100644
--- a/content/public/browser/render_widget_host_view_mac_delegate.h
+++ b/content/public/browser/render_widget_host_view_mac_delegate.h
@@ -27,15 +27,6 @@
 // normal processing should take place.
 - (BOOL)handleEvent:(NSEvent*)event;
 
-// Notification that a wheel event was unhandled.
-- (void)gotUnhandledWheelEvent;
-
-// Notification of scroll offset pinning.
-- (void)scrollOffsetPinnedToLeft:(BOOL)left toRight:(BOOL)right;
-
-// Notification of whether the view has a horizontal scrollbar.
-- (void)setHasHorizontalScrollbar:(BOOL)has_horizontal_scrollbar;
-
 // Provides validation of user interface items. If the return value is NO, then
 // the delegate is unaware of that item and |valid| is undefined.  Otherwise,
 // |valid| contains the validity of the specified item.
@@ -60,6 +51,10 @@
 // 2-finger history swipe in the given direction.
 - (BOOL)canRubberbandLeft:(NSView*)view;
 - (BOOL)canRubberbandRight:(NSView*)view;
+// Notification that a wheel event was received.

[Avi (use Gerrit), 2014/04/08 19:35:06]

You need a blank line before this comment.

[erikchen, 2014/04/08 19:59:05]

Done.

+// |consumed| indicates whether the renderer or the render_widget_host_view
+// delegate consumed the event.
+- (void)gotWheelEventConsumed:(BOOL)consumed;
 @end
 
 #endif  // CONTENT_PUBLIC_BROWSER_RENDER_WIDGET_HOST_VIEW_MAC_DELEGATE_H_