chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa_unittest.mm - Issue 1855783002: mac: More pasteboard fixes.

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_unittest.mm

Issue 1855783002: mac: More pasteboard fixes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@temp23_dnd

Patch Set: Created 4 years, 9 months 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_view_cocoa.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm » ('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_unittest.mm

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

index d497033558d87ac7cc5d1549479c1ee44b069f38..a4f173405cb759f04225d8562d0c340ebb9ee844 100644

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

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

@@ -21,6 +21,7 @@

#include "testing/gtest/include/gtest/gtest.h"

#include "testing/platform_test.h"

#import "third_party/mozilla/NSPasteboard+Utils.h"

+#include "ui/base/clipboard/clipboard_util_mac.h"

using bookmarks::BookmarkModel;

using bookmarks::BookmarkNode;

@@ -237,7 +238,8 @@ TEST_F(BookmarkBarViewTest, BookmarkButtonDragAndDrop) {

[[BookmarkButton alloc] init]);

[dragged_button setCell:button_cell];

[info setDraggingSource:dragged_button.get()];

- [info setDragDataType:kBookmarkButtonDragType];

+ [info setDragDataType:ui::ClipboardUtil::UTIForPasteboardType(

+ kBookmarkButtonDragType)];

[info setButton:dragged_button.get()];

[info setBookmarkModel:bookmark_model];

EXPECT_EQ([view_ draggingEntered:(id)info.get()], NSDragOperationMove);

@@ -279,7 +281,8 @@ TEST_F(BookmarkBarViewTest, BookmarkButtonDragAndDropAcrossProfiles) {

[[BookmarkButton alloc] init]);

[dragged_button setCell:button_cell];

[info setDraggingSource:dragged_button.get()];

- [info setDragDataType:kBookmarkButtonDragType];

+ [info setDragDataType:ui::ClipboardUtil::UTIForPasteboardType(

+ kBookmarkButtonDragType)];

[info setButton:dragged_button.get()];

[info setBookmarkModel:BookmarkModelFactory::GetForProfile(other_profile)];

EXPECT_EQ([view_ draggingEntered:(id)info.get()], NSDragOperationMove);

@@ -317,7 +320,8 @@ TEST_F(BookmarkBarViewTest, BookmarkButtonDropIndicator) {

base::scoped_nsobject<BookmarkButton> dragged_button(

[[BookmarkButton alloc] init]);

[info setDraggingSource:dragged_button.get()];

- [info setDragDataType:kBookmarkButtonDragType];

+ [info setDragDataType:ui::ClipboardUtil::UTIForPasteboardType(

+ kBookmarkButtonDragType)];

EXPECT_FALSE([info draggingEnteredCalled]);

EXPECT_EQ([view_ draggingEntered:(id)info.get()], NSDragOperationMove);

EXPECT_TRUE([info draggingEnteredCalled]); // Ensure controller pinged.