summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/web_drop_target.mm
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 19:09:13 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 19:09:13 +0000
commitfc1c87ef73552e594ab9b98c4b8655e92b5d4409 (patch)
treeee3fc525d58a31d27835f3adfda3fa3a965ca63f /chrome/browser/cocoa/web_drop_target.mm
parentd9a96bc21ce5dd85b72d23cc04f5164be5066fb9 (diff)
downloadchromium_src-fc1c87ef73552e594ab9b98c4b8655e92b5d4409.zip
chromium_src-fc1c87ef73552e594ab9b98c4b8655e92b5d4409.tar.gz
chromium_src-fc1c87ef73552e594ab9b98c4b8655e92b5d4409.tar.bz2
Try backing out r28260 to see if it caused the Mac startup test perf regression
BUG=23517 24118 TEST=Observe Mac perf bot Review URL: http://codereview.chromium.org/267010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28284 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/web_drop_target.mm')
-rw-r--r--chrome/browser/cocoa/web_drop_target.mm11
1 files changed, 2 insertions, 9 deletions
diff --git a/chrome/browser/cocoa/web_drop_target.mm b/chrome/browser/cocoa/web_drop_target.mm
index a7eaac6..b797671 100644
--- a/chrome/browser/cocoa/web_drop_target.mm
+++ b/chrome/browser/cocoa/web_drop_target.mm
@@ -176,18 +176,11 @@ using WebKit::WebDragOperationsMask;
DCHECK([pboard containsURLData]);
// The getURLs:andTitles: will already validate URIs so we don't need to
- // again. However, if the URI is a local file, it won't be prefixed with
- // file://, which is what GURL expects. We can detect that case because the
- // resulting URI will have no valid scheme, and we'll assume it's a local
- // file. The arrays returned are both of NSString's.
+ // again. The arrays it returns are both of NSString's.
NSArray* urls = nil;
NSArray* titles = nil;
[pboard getURLs:&urls andTitles:&titles];
- NSString* urlString = [urls objectAtIndex:0];
- NSURL* url = [NSURL URLWithString:urlString];
- if (![url scheme])
- urlString = [[NSURL fileURLWithPath:urlString] absoluteString];
- data->url = GURL([urlString UTF8String]);
+ data->url = GURL([[urls objectAtIndex:0] UTF8String]);
data->url_title = base::SysNSStringToUTF16([titles objectAtIndex:0]);
}