MacViews: Implemented Drag & Drop

ui/base/dragdrop/os_exchange_data_provider_mac.h

Index: ui/base/dragdrop/os_exchange_data_provider_mac.h
diff --git a/ui/base/dragdrop/os_exchange_data_provider_mac.h b/ui/base/dragdrop/os_exchange_data_provider_mac.h
index 378602923a97eeb0f38ccd4c0a2081a6c0a26304..55f47c971a2dd53cd9ff03e0ba32d540e8c1e993 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_mac.h
+++ b/ui/base/dragdrop/os_exchange_data_provider_mac.h
@@ -5,12 +5,19 @@
 #ifndef UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_MAC_H_
 #define UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_MAC_H_
 
+#include "base/event_types.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #import "ui/base/clipboard/clipboard_util_mac.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
+#include "ui/events/event.h"
+#include "ui/gfx/geometry/vector2d.h"
+#include "ui/gfx/image/image_skia.h"
 
 @class NSPasteboard;
+@class NSArray;
+@class NSData;
+@class NSString;
 
 namespace ui {
 class UniquePasteboard;
@@ -32,6 +39,8 @@ class UI_BASE_EXPORT OSExchangeDataProviderMac
   void SetFilenames(const std::vector<FileInfo>& filenames) override;
   void SetPickledData(const Clipboard::FormatType& format,
                       const base::Pickle& data) override;
+  void SetDragImage(const gfx::ImageSkia& image) override;
+  void SetNativeEvent(const base::NativeEvent& event) override;
   bool GetString(base::string16* data) const override;
   bool GetURLAndTitle(OSExchangeData::FilenameToURLPolicy policy,
                       GURL* url,
@@ -40,15 +49,27 @@ class UI_BASE_EXPORT OSExchangeDataProviderMac
   bool GetFilenames(std::vector<FileInfo>* filenames) const override;
   bool GetPickledData(const Clipboard::FormatType& format,
                       base::Pickle* data) const override;
+  const gfx::ImageSkia& GetDragImage() const override;
+  const base::NativeEvent& GetNativeEvent() const override;
+  NSData* GetNSDataForType(NSString* type) const;
   bool HasString() const override;
   bool HasURL(OSExchangeData::FilenameToURLPolicy policy) const override;
   bool HasFile() const override;
   bool HasCustomFormat(const Clipboard::FormatType& format) const override;
 
+  NSArray* GetPasteboardTypes() const;
+
+  static Provider* CreateProviderFromPasteboard(NSPasteboard*);

[tapted, 2016/05/11 12:36:15]

return std::unique_ptr maybe

[spqchan, 2016/05/23 21:26:21]

Done.

+  static NSArray* SupportedPasteboardTypes();
+
  private:
   explicit OSExchangeDataProviderMac(scoped_refptr<ui::UniquePasteboard>);
   scoped_refptr<ui::UniquePasteboard> pasteboard_;
 
+  gfx::ImageSkia drag_image_;
+
+  base::NativeEvent event_;

[tapted, 2016/05/11 12:36:15]

this might need to be retained -> scoped_nsobject<NSEvent>?

[spqchan, 2016/05/23 21:26:21]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(OSExchangeDataProviderMac);
 };