Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ui / base / dragdrop / os_exchange_data_provider_win.h

diff --git a/src/ui/base/dragdrop/os_exchange_data_provider_win.h b/src/ui/base/dragdrop/os_exchange_data_provider_win.h
index 79a8fdb..a89deb2 100644 (file)
--- a/src/ui/base/dragdrop/os_exchange_data_provider_win.h
+++ b/src/ui/base/dragdrop/os_exchange_data_provider_win.h
@@ -149,11 +149,12 @@ class UI_BASE_EXPORT OSExchangeDataProviderWin
 
   // OSExchangeData::Provider methods.
   virtual Provider* Clone() const;
+  virtual void MarkOriginatedFromRenderer();
+  virtual bool DidOriginateFromRenderer() const;
   virtual void SetString(const base::string16& data);
   virtual void SetURL(const GURL& url, const base::string16& title);
   virtual void SetFilename(const base::FilePath& path);
-  virtual void SetFilenames(
-      const std::vector<OSExchangeData::FileInfo>& filenames);
+  virtual void SetFilenames(const std::vector<FileInfo>& filenames);
   virtual void SetPickledData(const OSExchangeData::CustomFormat& format,
                               const Pickle& data);
   virtual void SetFileContents(const base::FilePath& filename,
@@ -165,15 +166,14 @@ class UI_BASE_EXPORT OSExchangeDataProviderWin
                               GURL* url,
                               base::string16* title) const;
   virtual bool GetFilename(base::FilePath* path) const;
-  virtual bool GetFilenames(
-      std::vector<OSExchangeData::FileInfo>* filenames) const;
+  virtual bool GetFilenames(std::vector<FileInfo>* filenames) const;
   virtual bool GetPickledData(const OSExchangeData::CustomFormat& format,
                               Pickle* data) const;
   virtual bool GetFileContents(base::FilePath* filename,
                                std::string* file_contents) const;
   virtual bool GetHtml(base::string16* html, GURL* base_url) const;
   virtual bool HasString() const;
-  virtual bool HasURL() const;
+  virtual bool HasURL(OSExchangeData::FilenameToURLPolicy policy) const;
   virtual bool HasFile() const;
   virtual bool HasFileContents() const;
   virtual bool HasHtml() const;
@@ -181,23 +181,18 @@ class UI_BASE_EXPORT OSExchangeDataProviderWin
       const OSExchangeData::CustomFormat& format) const;
   virtual void SetDownloadFileInfo(
       const OSExchangeData::DownloadFileInfo& download_info);
-  virtual void SetInDragLoop(bool in_drag_loop) OVERRIDE;
-#if defined(USE_AURA)
   virtual void SetDragImage(const gfx::ImageSkia& image,
                             const gfx::Vector2d& cursor_offset) OVERRIDE;
   virtual const gfx::ImageSkia& GetDragImage() const OVERRIDE;
   virtual const gfx::Vector2d& GetDragImageOffset() const OVERRIDE;
-#endif
 
  private:
   scoped_refptr<DataObjectImpl> data_;
   base::win::ScopedComPtr<IDataObject> source_object_;
 
-#if defined(USE_AURA)
   // Drag image and offset data. Only used for Ash.
   gfx::ImageSkia drag_image_;
   gfx::Vector2d drag_image_offset_;
-#endif
 
   DISALLOW_COPY_AND_ASSIGN(OSExchangeDataProviderWin);
 };