Chromium Code Reviews| Index: third_party/mozilla/NSURL+Utils.m |
| diff --git a/third_party/mozilla/NSURL+Utils.m b/third_party/mozilla/NSURL+Utils.m |
| index 300facdd9b767ead6f8ed98b62e323a84b478629..654f8db50c45bc8de882d6c65d0166d9ffbc27b9 100644 |
| --- a/third_party/mozilla/NSURL+Utils.m |
| +++ b/third_party/mozilla/NSURL+Utils.m |
| @@ -64,44 +64,10 @@ |
| // |
| +(NSURL*)URLFromInetloc:(NSString*)inFile |
| { |
| - FSRef ref; |
| - NSURL *ret = nil; |
| - |
| - if (inFile && FSPathMakeRef((UInt8 *)[inFile fileSystemRepresentation], &ref, NULL) == noErr) { |
| - short resRef; |
| - |
| - resRef = FSOpenResFile(&ref, fsRdPerm); |
| - |
| - if (resRef != -1) { // Has resouce fork. |
| - Handle urlResHandle; |
| - |
| - if ((urlResHandle = Get1Resource('url ', 256))) { // Has 'url ' resource with ID 256. |
| - long size; |
| - |
| - size = GetMaxResourceSize(urlResHandle); |
| -// Begin Google Modified |
| -// ret = [NSURL URLWithString:[NSString stringWithCString:(char *)*urlResHandle length:size]]; |
| - NSString *urlString = [[[NSString alloc] initWithBytes:(void *)*urlResHandle |
| - length:size |
| - encoding:NSMacOSRomanStringEncoding] // best guess here |
| - autorelease]; |
| - ret = [NSURL URLWithString:urlString]; |
| -// End Google Modified |
| - } |
| - |
| - CloseResFile(resRef); |
| - } |
| - |
| - if (!ret) { // Look for valid plist data. |
| - NSDictionary *plist; |
| - if ((plist = [[NSDictionary alloc] initWithContentsOfFile:inFile])) { |
| - ret = [NSURL URLWithString:[plist objectForKey:@"URL"]]; |
| - [plist release]; |
| - } |
| - } |
| - } |
| - |
| - return ret; |
| +//// Begin Google Modified |
|
Avi (use Gerrit)
2016/10/06 03:26:16
Indent 2.
Eugene But (OOO till 7-30)
2016/10/06 03:40:50
Done. Sorry about that.
|
| + NSDictionary *plist = [NSDictionary dictionaryWithContentsOfFile:inFile]; |
| + return [NSURL URLWithString:[plist objectForKey:@"URL"]]; |
| + //// End Google Modified |
| } |
| // |