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

Merge pull request #3913 from atom/fix-nsurl

Browse source 
Fix converting string to NSURL
This commit is contained in:
Cheng Zhao 2015-12-24 13:06:08 +08:00
commit e41dad5153
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
atom/common/platform_util_mac.mm
View file

@ -12,6 +12,7 @@
#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/sys_string_conversions.h" #include "base/strings/sys_string_conversions.h"
#include "net/base/mac/url_conversions.h"
#include "url/gurl.h" #include "url/gurl.h"
namespace platform_util { namespace platform_util {
@ -120,9 +121,7 @@ void OpenItem(const base::FilePath& full_path) {
bool OpenExternal(const GURL& url) { bool OpenExternal(const GURL& url) {
DCHECK([NSThread isMainThread]); DCHECK([NSThread isMainThread]);
NSString* url_string = base::SysUTF8ToNSString(url.spec()); NSURL* ns_url = net::NSURLWithGURL(url);
NSString* url_escaped_string = [url_string stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
NSURL* ns_url = [NSURL URLWithString:url_escaped_string];
if (!ns_url) { if (!ns_url) {
return false; return false;
} }