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

Unified Diff: ui/base/dragdrop/os_exchange_data_provider_mac.mm

Issue 1964283002: MacViews: Implemented Drag & Drop (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix for dcheng Created 4 years, 6 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: ui/base/dragdrop/os_exchange_data_provider_mac.mm
diff --git a/ui/base/dragdrop/os_exchange_data_provider_mac.mm b/ui/base/dragdrop/os_exchange_data_provider_mac.mm
index 5be2c7994894db9f8d33df4df0781fdede8dd5b6..9f9fa915ca48465435f7d41c69db236e602c0e05 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_mac.mm
+++ b/ui/base/dragdrop/os_exchange_data_provider_mac.mm
@@ -7,11 +7,14 @@
#import <Cocoa/Cocoa.h>
#include "base/logging.h"
+#include "base/memory/ptr_util.h"
#include "base/pickle.h"
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#import "third_party/mozilla/NSPasteboard+Utils.h"
#import "ui/base/clipboard/clipboard_util_mac.h"
+#include "ui/base/clipboard/custom_data_helper.h"
+#import "ui/base/dragdrop/cocoa_dnd_util.h"
#include "url/gurl.h"
namespace ui {
@@ -169,6 +172,46 @@ bool OSExchangeDataProviderMac::HasCustomFormat(
return [[pasteboard_->get() types] containsObject:format.ToNSString()];
}
+void OSExchangeDataProviderMac::SetDragImage(
+ const gfx::ImageSkia& image,
+ const gfx::Vector2d& cursor_offset) {
+ drag_image_ = image;
+ cursor_offset_ = cursor_offset;
+}
+
+const gfx::ImageSkia& OSExchangeDataProviderMac::GetDragImage() const {
+ return drag_image_;
+}
+
+const gfx::Vector2d& OSExchangeDataProviderMac::GetDragImageOffset() const {
+ return cursor_offset_;
+}
+
+NSData* OSExchangeDataProviderMac::GetNSDataForType(NSString* type) const {
+ return [pasteboard_->get() dataForType:type];
+}
+
+// static
+std::unique_ptr<OSExchangeData>
+OSExchangeDataProviderMac::CreateDataFromPasteboard(NSPasteboard* pasteboard) {
+ OSExchangeDataProviderMac* provider = new OSExchangeDataProviderMac();
+
+ for (NSPasteboardItem* item in [pasteboard pasteboardItems])
+ ClipboardUtil::AddDataToPasteboard(provider->pasteboard_->get(), item);
+
+ return base::MakeUnique<OSExchangeData>(provider);
+}
+
+// static
+NSArray* OSExchangeDataProviderMac::SupportedPasteboardTypes() {
+ return @[
+ kWebCustomDataPboardType, ui::ClipboardUtil::UTIForWebURLsAndTitles(),
+ NSURLPboardType, NSFilenamesPboardType, ui::kChromeDragDummyPboardType,
+ NSStringPboardType, NSHTMLPboardType, NSRTFPboardType,
+ NSFilenamesPboardType, ui::kWebCustomDataPboardType, NSPasteboardTypeString
+ ];
+}
+
///////////////////////////////////////////////////////////////////////////////
// OSExchangeData, public:

Powered by Google App Engine
This is Rietveld 408576698