| 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 1e46e2e4ae0d9d0cb4e8561de1c163a8df603caa..911973e58fd22a45a26c938d34b4e240e2f686d0 100644
|
| --- a/ui/base/dragdrop/os_exchange_data_provider_mac.h
|
| +++ b/ui/base/dragdrop/os_exchange_data_provider_mac.h
|
| @@ -21,29 +21,29 @@ class UI_BASE_EXPORT OSExchangeDataProviderMac
|
| virtual ~OSExchangeDataProviderMac();
|
|
|
| // 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 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;
|
| + 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;
|
| + 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;
|
| + Pickle* data) const override;
|
| + virtual bool HasString() const override;
|
| virtual bool HasURL(
|
| - OSExchangeData::FilenameToURLPolicy policy) const OVERRIDE;
|
| - virtual bool HasFile() const OVERRIDE;
|
| + OSExchangeData::FilenameToURLPolicy policy) const override;
|
| + virtual bool HasFile() const override;
|
| virtual bool HasCustomFormat(
|
| - const OSExchangeData::CustomFormat& format) const OVERRIDE;
|
| + const OSExchangeData::CustomFormat& format) const override;
|
|
|
| private:
|
| base::scoped_nsobject<NSPasteboard> pasteboard_;
|
|
|