mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: remove no longer needed macOS SDK forward declarations (#19918)

Browse source 
* chore: remove no longer needed macOS SDK forward declarations
* fix: linter errors in spec-main/node-spec.ts
This commit is contained in:
Milan Burda 2019-11-03 19:46:12 +01:00 • committed by Alexey Kuzmin
parent 5f27c1fa25
commit f808f50fa6
3 changed files with 15 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

31
shell/browser/api/atom_api_system_preferences_mac.mm
View file

@ -103,21 +103,6 @@ AVMediaType ParseMediaType(const std::string& media_type) {
}
}
std::string ConvertAuthorizationStatus(AVAuthorizationStatusMac status) {
switch (status) {
case AVAuthorizationStatusNotDeterminedMac:
return "not-determined";
case AVAuthorizationStatusRestrictedMac:
return "restricted";
case AVAuthorizationStatusDeniedMac:
return "denied";
case AVAuthorizationStatusAuthorizedMac:
return "granted";
default:
return "unknown";
}
}
} // namespace
void SystemPreferences::PostNotification(const std::string& name,
@ -591,11 +576,21 @@ std::string SystemPreferences::GetMediaAccessStatus(
gin_helper::Arguments* args) {
if (auto type = ParseMediaType(media_type)) {
if (@available(macOS 10.14, *)) {
return ConvertAuthorizationStatus(
[AVCaptureDevice authorizationStatusForMediaType:type]);
switch ([AVCaptureDevice authorizationStatusForMediaType:type]) {
case AVAuthorizationStatusNotDetermined:
return "not-determined";
case AVAuthorizationStatusRestricted:
return "restricted";
case AVAuthorizationStatusDenied:
return "denied";
case AVAuthorizationStatusAuthorized:
return "granted";
default:
return "unknown";
}
} else {
// access always allowed pre-10.14 Mojave
return ConvertAuthorizationStatus(AVAuthorizationStatusAuthorizedMac);
return "granted";
}
} else {
args->ThrowError("Invalid media type");