Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_button.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
Index: chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm
index 43664314dfd8e4a2caf767cbfe49d682188aa875..983b0fc6b87de808faefda180c4ddc40c59a8178 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm
@@ -17,6 +17,7 @@
#import "chrome/browser/ui/cocoa/view_id_util.h"
#include "components/bookmarks/browser/bookmark_model.h"
#include "content/public/browser/user_metrics.h"
+#include "ui/base/clipboard/clipboard_util_mac.h"
#include "ui/base/cocoa/cocoa_base_utils.h"
#import "ui/base/cocoa/nsview_additions.h"
#include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
@@ -215,7 +216,9 @@ BookmarkButton* gDraggedButton = nil; // Weak
[self setHidden:YES];
NSPasteboardItem* pbItem = [NSPasteboardItem new];
- [pbItem setDataProvider:self forTypes:@[ kBookmarkButtonDragType ]];
+ [pbItem setDataProvider:self
+ forTypes:@[ ui::ClipboardUtil::UTIForPasteboardType(
+ kBookmarkButtonDragType) ]];
base::scoped_nsobject<NSDraggingItem> dragItem(
[[NSDraggingItem alloc] initWithPasteboardWriter:pbItem]);
@@ -240,9 +243,10 @@ BookmarkButton* gDraggedButton = nil; // Weak
- (void)pasteboard:(NSPasteboard*)sender
item:(NSPasteboardItem*)item
provideDataForType:(NSString*)type {
- [sender setData:[NSData dataWithBytes:&gDraggedButton
- length:sizeof(gDraggedButton)]
- forType:kBookmarkButtonDragType];
+ [sender
+ setData:[NSData dataWithBytes:&gDraggedButton
+ length:sizeof(gDraggedButton)]
+ forType:ui::ClipboardUtil::UTIForPasteboardType(kBookmarkButtonDragType)];
}
- (NSDragOperation)draggingSession:(NSDraggingSession*)session

Powered by Google App Engine
This is Rietveld 408576698