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

Unified Diff: ui/base/test/scoped_preferred_scroller_style_mac.mm

Issue 1863513002: Mac: Remove some remaining 10.6 logic for absent overlay scrollbar APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Zap notification, import appkit rather than forward decs 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
« no previous file with comments | « third_party/WebKit/Source/platform/scroll/ScrollbarThemeMac.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/test/scoped_preferred_scroller_style_mac.mm
diff --git a/ui/base/test/scoped_preferred_scroller_style_mac.mm b/ui/base/test/scoped_preferred_scroller_style_mac.mm
index 8a94cc63dd4d1945d8dd4eca51c0f49d0e2772c9..1a73819bd122591ef9f27ec219f103fa89e0b5d9 100644
--- a/ui/base/test/scoped_preferred_scroller_style_mac.mm
+++ b/ui/base/test/scoped_preferred_scroller_style_mac.mm
@@ -4,7 +4,8 @@
#import "ui/base/test/scoped_preferred_scroller_style_mac.h"
-#import "base/mac/sdk_forward_declarations.h"
+#import <AppKit/AppKit.h>
+
#import "base/mac/scoped_objc_class_swizzler.h"
using base::mac::ScopedObjCClassSwizzler;
@@ -54,9 +55,6 @@ namespace test {
ScopedPreferredScrollerStyle::ScopedPreferredScrollerStyle(bool overlay)
: overlay_(overlay) {
- if (![NSScroller respondsToSelector:@selector(preferredScrollerStyle)])
- return;
-
NSInteger previous_style = [NSScroller preferredScrollerStyle];
Class style_class = overlay_
? [FakeNSScrollerPreferredStyleOverlayDonor class]
@@ -70,9 +68,6 @@ ScopedPreferredScrollerStyle::ScopedPreferredScrollerStyle(bool overlay)
}
ScopedPreferredScrollerStyle::~ScopedPreferredScrollerStyle() {
- if (!swizzler_)
- return; // Handle 10.6, which wouldn't have swizzled anything.
-
swizzler_.reset();
if ([NSScroller preferredScrollerStyle] != GetScrollerStyle(overlay_))
« no previous file with comments | « third_party/WebKit/Source/platform/scroll/ScrollbarThemeMac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698