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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/app_list/cocoa/scroll_view_with_no_scrollbars.mm

Issue 1917973002: mac: Remove IsOSLion(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 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
« remoting/host/curtain_mode_mac.cc ('K') | « ui/accelerated_widget_mac/accelerated_widget_mac.mm ('k') | ui/base/cocoa/base_view.mm » ('j') | ui/base/cocoa/base_view.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..12b026cef84d42049615b9fb793e316d2edc4242 100644
--- a/ui/app_list/cocoa/scroll_view_with_no_scrollbars.mm
+++ b/ui/app_list/cocoa/scroll_view_with_no_scrollbars.mm
@@ -29,7 +29,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 +39,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
« remoting/host/curtain_mode_mac.cc ('K') | « ui/accelerated_widget_mac/accelerated_widget_mac.mm ('k') | ui/base/cocoa/base_view.mm » ('j') | ui/base/cocoa/base_view.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698