| 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 98438bdf4841b1cc9e916fc10fba1b62ffc904c1..e54a2fdfe24be621085b2dcceede1d8af2766e4c 100644
|
| --- a/ui/base/dragdrop/os_exchange_data_provider_aura.h
|
| +++ b/ui/base/dragdrop/os_exchange_data_provider_aura.h
|
| @@ -32,8 +32,7 @@ class UI_BASE_EXPORT OSExchangeDataProviderAura
|
| 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<OSExchangeData::FileInfo>& filenames) 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;
|
| @@ -41,8 +40,7 @@ class UI_BASE_EXPORT OSExchangeDataProviderAura
|
| GURL* url,
|
| base::string16* title) const OVERRIDE;
|
| virtual bool GetFilename(base::FilePath* path) const OVERRIDE;
|
| - virtual bool GetFilenames(
|
| - std::vector<OSExchangeData::FileInfo>* filenames) 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;
|
| @@ -80,7 +78,7 @@ class UI_BASE_EXPORT OSExchangeDataProviderAura
|
| base::string16 title_;
|
|
|
| // File name.
|
| - std::vector<OSExchangeData::FileInfo> filenames_;
|
| + std::vector<FileInfo> filenames_;
|
|
|
| // PICKLED_DATA contents.
|
| PickleData pickle_data_;
|
|
|