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

Use base::mac::NSToCast.

Browse source
This commit is contained in:
Haojian Wu 2017-03-30 22:33:09 +02:00
parent 1b9780035c
commit bb51401c4c
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
atom/common/platform_util_mac.mm
View file

@ -11,6 +11,7 @@
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/files/file_util.h" #include "base/files/file_util.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/mac/foundation_util.h"
#include "base/mac/mac_logging.h" #include "base/mac/mac_logging.h"
#include "base/mac/scoped_aedesc.h" #include "base/mac/scoped_aedesc.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
@ -72,10 +73,10 @@ std::string MessageForOSStatus(OSStatus status, const char* default_message) {
// NSWorkspace#openURLs. // NSWorkspace#openURLs.
std::string OpenURL(NSURL* ns_url, bool activate) { std::string OpenURL(NSURL* ns_url, bool activate) {
CFURLRef openingApp = nullptr; CFURLRef openingApp = nullptr;
OSStatus status = LSGetApplicationForURL((CFURLRef)ns_url, OSStatus status = LSGetApplicationForURL(base::mac::NSToCFCast(ns_url),
kLSRolesAll, kLSRolesAll,
nullptr, nullptr,
&openingApp); &openingApp);
if (status != noErr) if (status != noErr)
return MessageForOSStatus(status, "Failed to open"); return MessageForOSStatus(status, "Failed to open");
@ -167,7 +168,8 @@ bool OpenItem(const base::FilePath& full_path) {
// Add the single path to the file list. C-style cast to avoid both a // Add the single path to the file list. C-style cast to avoid both a
// static_cast and a const_cast to get across the toll-free bridge. // static_cast and a const_cast to get across the toll-free bridge.
CFURLRef pathURLRef = (CFURLRef)[NSURL fileURLWithPath:path_string]; CFURLRef pathURLRef = base::mac::NSToCFCast(
[NSURL fileURLWithPath:path_string]);
FSRef pathRef; FSRef pathRef;
if (CFURLGetFSRef(pathURLRef, &pathRef)) { if (CFURLGetFSRef(pathURLRef, &pathRef)) {
status = AEPutPtr(fileList.OutPointer(), // theAEDescList status = AEPutPtr(fileList.OutPointer(), // theAEDescList