Index: ui/app_list/cocoa/scroll_view_with_no_scrollbars.mm |
diff --git a/ui/app_list/cocoa/scroll_view_with_no_scrollbars.mm b/ui/app_list/cocoa/scroll_view_with_no_scrollbars.mm |
index b855ee058147238bed6038709699dd7613cdb5a7..d4cff30a462a47bfd98b5e282f382cb42a2d5f97 100644 |
--- a/ui/app_list/cocoa/scroll_view_with_no_scrollbars.mm |
+++ b/ui/app_list/cocoa/scroll_view_with_no_scrollbars.mm |
@@ -4,7 +4,6 @@ |
#include "ui/app_list/cocoa/scroll_view_with_no_scrollbars.h" |
-#include "base/mac/mac_util.h" |
#include "base/mac/scoped_cftyperef.h" |
#include "base/mac/scoped_nsobject.h" |
#include "base/mac/sdk_forward_declarations.h" |
@@ -29,7 +28,7 @@ |
- (id)initWithFrame:(NSRect)frame { |
if ((self = [super initWithFrame:frame])) { |
- [self setHasHorizontalScroller:base::mac::IsOSLionOrLater()]; |
+ [self setHasHorizontalScroller:YES]; |
NSRect horizontalScrollerRect = [self bounds]; |
horizontalScrollerRect.size.height = 0; |
base::scoped_nsobject<InvisibleScroller> horizontalScroller( |
@@ -39,12 +38,6 @@ |
return self; |
} |
-- (void)endGestureWithEvent:(NSEvent*)event { |
- [super endGestureWithEvent:event]; |
- if (!base::mac::IsOSLionOrLater()) |
- [delegate_ userScrolling:NO]; |
-} |
- |
- (void)scrollWheel:(NSEvent*)event { |
if ([event subtype] == NSMouseEventSubtype) { |
// Since the scroll view has no vertical scroller, regular up and down mouse |