| Index: ui/base/dragdrop/os_exchange_data_provider_aura.h
|
| diff --git a/ui/base/dragdrop/os_exchange_data_provider_aura.h b/ui/base/dragdrop/os_exchange_data_provider_aura.h
|
| index 0f9163b6224d59cda61662b5fb18ea656e83ff1b..b489bcbd682b3a405435dc3a3dca99b7bef3aa8a 100644
|
| --- a/ui/base/dragdrop/os_exchange_data_provider_aura.h
|
| +++ b/ui/base/dragdrop/os_exchange_data_provider_aura.h
|
| @@ -23,41 +23,39 @@ class UI_BASE_EXPORT OSExchangeDataProviderAura
|
| : public OSExchangeData::Provider {
|
| public:
|
| OSExchangeDataProviderAura();
|
| - virtual ~OSExchangeDataProviderAura();
|
| + ~OSExchangeDataProviderAura() override;
|
|
|
| // Overridden from OSExchangeData::Provider:
|
| - virtual Provider* Clone() const override;
|
| - virtual void MarkOriginatedFromRenderer() override;
|
| - virtual bool DidOriginateFromRenderer() const override;
|
| - virtual void SetString(const base::string16& data) override;
|
| - virtual void SetURL(const GURL& url, const base::string16& title) override;
|
| - virtual void SetFilename(const base::FilePath& path) override;
|
| - virtual void SetFilenames(const std::vector<FileInfo>& filenames) override;
|
| - virtual void SetPickledData(const OSExchangeData::CustomFormat& format,
|
| - const Pickle& data) override;
|
| - virtual bool GetString(base::string16* data) const override;
|
| - virtual bool GetURLAndTitle(OSExchangeData::FilenameToURLPolicy policy,
|
| - GURL* url,
|
| - base::string16* title) const override;
|
| - virtual bool GetFilename(base::FilePath* path) const override;
|
| - virtual bool GetFilenames(std::vector<FileInfo>* filenames) const override;
|
| - virtual bool GetPickledData(const OSExchangeData::CustomFormat& format,
|
| - Pickle* data) const override;
|
| - virtual bool HasString() const override;
|
| - virtual bool HasURL(OSExchangeData::FilenameToURLPolicy policy) const
|
| - override;
|
| - virtual bool HasFile() const override;
|
| - virtual bool HasCustomFormat(const OSExchangeData::CustomFormat& format) const
|
| + Provider* Clone() const override;
|
| + void MarkOriginatedFromRenderer() override;
|
| + bool DidOriginateFromRenderer() const override;
|
| + void SetString(const base::string16& data) override;
|
| + void SetURL(const GURL& url, const base::string16& title) override;
|
| + void SetFilename(const base::FilePath& path) override;
|
| + void SetFilenames(const std::vector<FileInfo>& filenames) override;
|
| + void SetPickledData(const OSExchangeData::CustomFormat& format,
|
| + const Pickle& data) override;
|
| + bool GetString(base::string16* data) const override;
|
| + bool GetURLAndTitle(OSExchangeData::FilenameToURLPolicy policy,
|
| + GURL* url,
|
| + base::string16* title) const override;
|
| + bool GetFilename(base::FilePath* path) const override;
|
| + bool GetFilenames(std::vector<FileInfo>* filenames) const override;
|
| + bool GetPickledData(const OSExchangeData::CustomFormat& format,
|
| + Pickle* data) const override;
|
| + bool HasString() const override;
|
| + bool HasURL(OSExchangeData::FilenameToURLPolicy policy) const override;
|
| + bool HasFile() const override;
|
| + bool HasCustomFormat(const OSExchangeData::CustomFormat& format) const
|
| override;
|
|
|
| - virtual void SetHtml(const base::string16& html,
|
| - const GURL& base_url) override;
|
| - virtual bool GetHtml(base::string16* html, GURL* base_url) const override;
|
| - virtual bool HasHtml() const override;
|
| - 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;
|
| + void SetHtml(const base::string16& html, const GURL& base_url) override;
|
| + bool GetHtml(base::string16* html, GURL* base_url) const override;
|
| + bool HasHtml() const override;
|
| + void SetDragImage(const gfx::ImageSkia& image,
|
| + const gfx::Vector2d& cursor_offset) override;
|
| + const gfx::ImageSkia& GetDragImage() const override;
|
| + const gfx::Vector2d& GetDragImageOffset() const override;
|
|
|
| private:
|
| typedef std::map<OSExchangeData::CustomFormat, Pickle> PickleData;
|
|
|