bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Mac: Fix Xcode 7 (10.11 SDK) build errors (issue #1732)

Browse Source
This commit is contained in:
Marshall Greenblatt
2015-12-08 12:59:24 -05:00
parent 626fc561ca
commit 864db71f6b
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libcef/browser/native/javascript_dialog_runner_mac.mm
View File

@@ -140,8 +140,13 @@ void CefJavaScriptDialogRunnerMac::Run(
[other setKeyEquivalent:@"\e"];
}
// Calling beginSheetModalForWindow:nil is wrong API usage. For now work
// around the "callee requires a non-null argument" error that occurs when
// building with the 10.11 SDK. See http://crbug.com/383820 for related
// discussion.
id nilArg = nil;
[alert
beginSheetModalForWindow:nil // nil here makes it app-modal
beginSheetModalForWindow:nilArg // nil here makes it app-modal
modalDelegate:helper_
didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:)
contextInfo:this];
@@ -163,4 +168,3 @@ void CefJavaScriptDialogRunnerMac::DialogClosed(
helper_.reset(nil);
callback_.Run(success, user_input);
}