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

Unified Diff: chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm

Issue 10092017: Mac: Prevent NTP mousewheel events from being suppressed on Lion. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix scrolling when over page switcher. Created 8 years, 8 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: chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm
diff --git a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm
index 8599093b65c2e49f02dd0128b259fa1b3f8961bd..f8607dd87bc5d0a17deb1e9da4e0079b68eea707 100644
--- a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm
+++ b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm
@@ -174,20 +174,10 @@ class SpellCheckRenderViewObserver : public content::RenderViewHostObserver {
return NO;
}
- BOOL suppressWheelEvent = NO;
- Browser* browser = BrowserList::FindBrowserWithWindow([theEvent window]);
- if (browser && [NSEvent isSwipeTrackingFromScrollEventsEnabled]) {
- content::WebContents* contents = browser->GetSelectedWebContents();
- if (contents && contents->GetURL() == GURL(chrome::kChromeUINewTabURL)) {
- // Always do history navigation on the NTP if it's enabled.
- gotUnhandledWheelEvent_ = YES;
- suppressWheelEvent = YES;
- }
- }
-
if (gotUnhandledWheelEvent_ &&
[NSEvent isSwipeTrackingFromScrollEventsEnabled] &&
[theEvent phase] == NSEventPhaseChanged) {
+ Browser* browser = BrowserList::FindBrowserWithWindow([theEvent window]);
totalScrollDelta_.width += [theEvent scrollingDeltaX];
totalScrollDelta_.height += [theEvent scrollingDeltaY];
@@ -283,7 +273,7 @@ class SpellCheckRenderViewObserver : public content::RenderViewHostObserver {
return YES;
}
}
- return suppressWheelEvent;
+ return NO;
}
- (BOOL)validateUserInterfaceItem:(id<NSValidatedUserInterfaceItem>)item

Powered by Google App Engine
This is Rietveld 408576698