chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm - Issue 814833007: bookmarks: Move bookmark_pasteboard_helper_mac functions into 'bookmarks' namespace.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm

Issue 814833007: bookmarks: Move bookmark_pasteboard_helper_mac functions into 'bookmarks' namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.mm ('k') | components/bookmarks/browser/bookmark_pasteboard_helper_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm

index c77826352bd1f1a5790882403d693fc5645e2df4..5df849391bbc4521d196b6fd938f88f106fdd82d 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm

@@ -127,7 +127,7 @@ using base::UserMetricsAction;

if (![controller_ draggingAllowed:info])

return NSDragOperationNone;

if ([[info draggingPasteboard] dataForType:kBookmarkButtonDragType] ||

- PasteboardContainsBookmarks(ui::CLIPBOARD_TYPE_DRAG) ||

+ bookmarks::PasteboardContainsBookmarks(ui::CLIPBOARD_TYPE_DRAG) ||

[[info draggingPasteboard] containsURLData]) {

// We only show the drop indicator if we're not in a position to

// perform a hover-open since it doesn't make sense to do both.