diff options
| author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-24 04:45:27 +0000 |
|---|---|---|
| committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-24 04:45:27 +0000 |
| commit | c95efd392aa8835e80b34e1b29dd3a224c4e575b (patch) | |
| tree | f8b9ca10e16918f045d003e170dd30bd97e78284 /chrome/browser/cocoa/bookmark_bar_view.mm | |
| parent | 703f8d749f9cb925a83a531eda5f2a1fd897b230 (diff) | |
| download | chromium_src-c95efd392aa8835e80b34e1b29dd3a224c4e575b.zip chromium_src-c95efd392aa8835e80b34e1b29dd3a224c4e575b.tar.gz chromium_src-c95efd392aa8835e80b34e1b29dd3a224c4e575b.tar.bz2 | |
Don't populate WebDropData with file URLs when dragging files.
This is the OS X patch. There will be separate patches for Windows and Linux.
BUG=42685
TEST=unit_tests --gtest_filter=WebDropTargetTest.*
Review URL: http://codereview.chromium.org/2095011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48016 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/bookmark_bar_view.mm')
| -rw-r--r-- | chrome/browser/cocoa/bookmark_bar_view.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/bookmark_bar_view.mm b/chrome/browser/cocoa/bookmark_bar_view.mm index f4c9f15..6923081 100644 --- a/chrome/browser/cocoa/bookmark_bar_view.mm +++ b/chrome/browser/cocoa/bookmark_bar_view.mm @@ -42,7 +42,7 @@ name:kBrowserThemeDidChangeNotification object:nil]; - DCHECK(controller_ && "Expected this to be hooked up via Interface Builder"); + DCHECK(controller_) << "Expected this to be hooked up via Interface Builder"; NSArray* types = [NSArray arrayWithObjects: NSStringPboardType, NSHTMLPboardType, @@ -200,7 +200,7 @@ NSArray* urls = nil; NSArray* titles = nil; - [pboard getURLs:&urls andTitles:&titles]; + [pboard getURLs:&urls andTitles:&titles convertingFilenames:YES]; return [controller_ addURLs:urls withTitles:titles |