| Index: ui/base/dragdrop/os_exchange_data_provider_win.cc
|
| diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.cc b/ui/base/dragdrop/os_exchange_data_provider_win.cc
|
| index d1a88ab6e856f1d48bc611ddcbe4eb6c0b51ed56..02f87d37b33b3c3924ae9eaed8c1a47a89109c9c 100644
|
| --- a/ui/base/dragdrop/os_exchange_data_provider_win.cc
|
| +++ b/ui/base/dragdrop/os_exchange_data_provider_win.cc
|
| @@ -36,10 +36,10 @@ static void CreateValidFileNameFromTitle(const GURL& url,
|
| const string16& title,
|
| string16* validated);
|
| // Creates a new STGMEDIUM object to hold a file.
|
| -static STGMEDIUM* GetStorageForFileName(const FilePath& path);
|
| +static STGMEDIUM* GetStorageForFileName(const base::FilePath& path);
|
| // Creates a File Descriptor for the creation of a file to the given URL and
|
| // returns a handle to it.
|
| -static STGMEDIUM* GetStorageForFileDescriptor(const FilePath& path);
|
| +static STGMEDIUM* GetStorageForFileDescriptor(const base::FilePath& path);
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
| // FormatEtcEnumerator
|
| @@ -297,7 +297,7 @@ void OSExchangeDataProviderWin::SetURL(const GURL& url,
|
| CreateValidFileNameFromTitle(url, title, &valid_file_name);
|
| std::string shortcut_url_file_contents;
|
| GetInternetShortcutFileContents(url, &shortcut_url_file_contents);
|
| - SetFileContents(FilePath(valid_file_name), shortcut_url_file_contents);
|
| + SetFileContents(base::FilePath(valid_file_name), shortcut_url_file_contents);
|
|
|
| // Add a UniformResourceLocator link for apps like IE and Word.
|
| storage = GetStorageForString16(UTF8ToUTF16(url.spec()));
|
| @@ -320,7 +320,7 @@ void OSExchangeDataProviderWin::SetURL(const GURL& url,
|
| new DataObjectImpl::StoredDataInfo(CF_TEXT, storage));
|
| }
|
|
|
| -void OSExchangeDataProviderWin::SetFilename(const FilePath& path) {
|
| +void OSExchangeDataProviderWin::SetFilename(const base::FilePath& path) {
|
| STGMEDIUM* storage = GetStorageForFileName(path);
|
| DataObjectImpl::StoredDataInfo* info =
|
| new DataObjectImpl::StoredDataInfo(CF_HDROP, storage);
|
| @@ -346,7 +346,7 @@ void OSExchangeDataProviderWin::SetPickledData(CLIPFORMAT format,
|
| }
|
|
|
| void OSExchangeDataProviderWin::SetFileContents(
|
| - const FilePath& filename,
|
| + const base::FilePath& filename,
|
| const std::string& file_contents) {
|
| // Add CFSTR_FILEDESCRIPTOR
|
| STGMEDIUM* storage = GetStorageForFileDescriptor(filename);
|
| @@ -400,11 +400,11 @@ bool OSExchangeDataProviderWin::GetURLAndTitle(GURL* url,
|
| return false;
|
| }
|
|
|
| -bool OSExchangeDataProviderWin::GetFilename(FilePath* path) const {
|
| +bool OSExchangeDataProviderWin::GetFilename(base::FilePath* path) const {
|
| std::vector<string16> filenames;
|
| bool success = ClipboardUtil::GetFilenames(source_object_, &filenames);
|
| if (success)
|
| - *path = FilePath(filenames[0]);
|
| + *path = base::FilePath(filenames[0]);
|
| return success;
|
| }
|
|
|
| @@ -415,7 +415,8 @@ bool OSExchangeDataProviderWin::GetFilenames(
|
| if (success) {
|
| for (size_t i = 0; i < filenames_local.size(); ++i)
|
| filenames->push_back(
|
| - OSExchangeData::FileInfo(FilePath(filenames_local[i]), FilePath()));
|
| + OSExchangeData::FileInfo(base::FilePath(filenames_local[i]),
|
| + base::FilePath()));
|
| }
|
| return success;
|
| }
|
| @@ -440,14 +441,14 @@ bool OSExchangeDataProviderWin::GetPickledData(CLIPFORMAT format,
|
| }
|
|
|
| bool OSExchangeDataProviderWin::GetFileContents(
|
| - FilePath* filename,
|
| + base::FilePath* filename,
|
| std::string* file_contents) const {
|
| string16 filename_str;
|
| if (!ClipboardUtil::GetFileContents(source_object_, &filename_str,
|
| file_contents)) {
|
| return false;
|
| }
|
| - *filename = FilePath(filename_str);
|
| + *filename = base::FilePath(filename_str);
|
| return true;
|
| }
|
|
|
| @@ -636,7 +637,7 @@ void DataObjectImpl::RemoveData(const FORMATETC& format) {
|
| }
|
| }
|
|
|
| -void DataObjectImpl::OnDownloadCompleted(const FilePath& file_path) {
|
| +void DataObjectImpl::OnDownloadCompleted(const base::FilePath& file_path) {
|
| CLIPFORMAT hdrop_format = ClipboardUtil::GetCFHDropFormat()->cfFormat;
|
| DataObjectImpl::StoredData::iterator iter = contents_.begin();
|
| for (; iter != contents_.end(); ++iter) {
|
| @@ -934,7 +935,7 @@ static void CreateValidFileNameFromTitle(const GURL& url,
|
| *validated += extension;
|
| }
|
|
|
| -static STGMEDIUM* GetStorageForFileName(const FilePath& path) {
|
| +static STGMEDIUM* GetStorageForFileName(const base::FilePath& path) {
|
| const size_t kDropSize = sizeof(DROPFILES);
|
| const size_t kTotalBytes =
|
| kDropSize + (path.value().length() + 2) * sizeof(wchar_t);
|
| @@ -958,7 +959,7 @@ static STGMEDIUM* GetStorageForFileName(const FilePath& path) {
|
| }
|
|
|
| static STGMEDIUM* GetStorageForFileDescriptor(
|
| - const FilePath& path) {
|
| + const base::FilePath& path) {
|
| string16 file_name = path.value();
|
| DCHECK(!file_name.empty());
|
| HANDLE hdata = GlobalAlloc(GPTR, sizeof(FILEGROUPDESCRIPTOR));
|
|
|