Commit 76282c9f authored by Avi Drissman's avatar Avi Drissman Committed by Commit Bot

Remove code handling old SDKs.

Chromium uses the 10.14 SDK, so remove any code that handles the case
of an old SDK being used.

Bug: 1044838
Change-Id: I5db561bfaf5b8e6aac7352dac010d90fb202bdf6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2020883
Auto-Submit: Avi Drissman <avi@chromium.org>
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735435}
parent bcdaea92
...@@ -1640,13 +1640,8 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session; ...@@ -1640,13 +1640,8 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
- (BOOL)application:(NSApplication*)application - (BOOL)application:(NSApplication*)application
continueUserActivity:(NSUserActivity*)userActivity continueUserActivity:(NSUserActivity*)userActivity
#if !defined(MAC_OS_X_VERSION_10_14) || \
MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_14
restorationHandler:(void (^)(NSArray*))restorationHandler
#else
restorationHandler: restorationHandler:
(void (^)(NSArray<id<NSUserActivityRestoring>>*))restorationHandler (void (^)(NSArray<id<NSUserActivityRestoring>>*))restorationHandler
#endif
{ {
if (![userActivity.activityType if (![userActivity.activityType
isEqualToString:NSUserActivityTypeBrowsingWeb]) { isEqualToString:NSUserActivityTypeBrowsingWeb]) {
......
...@@ -170,16 +170,6 @@ namespace { ...@@ -170,16 +170,6 @@ namespace {
using RankMap = std::map<NSView*, int>; using RankMap = std::map<NSView*, int>;
// SDK 10.11 contains incompatible changes of sortSubviewsUsingFunction.
// It takes (__kindof NSView*) as comparator argument.
// https://llvm.org/bugs/show_bug.cgi?id=25149
#if !defined(MAC_OS_X_VERSION_10_11) || \
MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_11
using NSViewComparatorValue = id;
#else
using NSViewComparatorValue = __kindof NSView*;
#endif
// Return the content size for a minimum or maximum widget size. // Return the content size for a minimum or maximum widget size.
gfx::Size GetClientSizeForWindowSize(NSWindow* window, gfx::Size GetClientSizeForWindowSize(NSWindow* window,
const gfx::Size& window_size) { const gfx::Size& window_size) {
...@@ -191,8 +181,8 @@ gfx::Size GetClientSizeForWindowSize(NSWindow* window, ...@@ -191,8 +181,8 @@ gfx::Size GetClientSizeForWindowSize(NSWindow* window,
return gfx::Size([window contentRectForFrameRect:frame_rect].size); return gfx::Size([window contentRectForFrameRect:frame_rect].size);
} }
NSComparisonResult SubviewSorter(NSViewComparatorValue lhs, NSComparisonResult SubviewSorter(__kindof NSView* lhs,
NSViewComparatorValue rhs, __kindof NSView* rhs,
void* rank_as_void) { void* rank_as_void) {
DCHECK_NE(lhs, rhs); DCHECK_NE(lhs, rhs);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment