github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-25 23:38:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

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
parent aa85258d56 7bd9f2e5d0
commit e41dad5153
1 changed files with 2 additions and 3 deletions
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/scoped_aedesc.h"
#include "base/strings/sys_string_conversions.h"
#include "net/base/mac/url_conversions.h"
#include "url/gurl.h"
namespace platform_util {
@@ -120,9 +121,7 @@ void OpenItem(const base::FilePath& full_path) {
bool OpenExternal(const GURL& url) {
DCHECK([NSThread isMainThread]);
NSString* url_string = base::SysUTF8ToNSString(url.spec());
NSString* url_escaped_string = [url_string stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
NSURL* ns_url = [NSURL URLWithString:url_escaped_string];
NSURL* ns_url = net::NSURLWithGURL(url);
if (!ns_url) {
return false;
}