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 4a2356992262e4a5a854da0d26bae531dda7f9d4..44e6cb6c3f4317e7bba8c39b8e274a2f1b8b80cd 100644 |
--- a/ui/base/dragdrop/os_exchange_data_provider_win.cc |
+++ b/ui/base/dragdrop/os_exchange_data_provider_win.cc |
@@ -404,7 +404,7 @@ void OSExchangeDataProviderWin::SetHtml(const base::string16& html, |
} |
bool OSExchangeDataProviderWin::GetString(base::string16* data) const { |
- return ClipboardUtil::GetPlainText(source_object_.get(), data); |
+ return ClipboardUtil::GetPlainText(source_object_.Get(), data); |
} |
bool OSExchangeDataProviderWin::GetURLAndTitle( |
@@ -413,12 +413,12 @@ bool OSExchangeDataProviderWin::GetURLAndTitle( |
base::string16* title) const { |
base::string16 url_str; |
bool success = ClipboardUtil::GetUrl( |
- source_object_.get(), url, title, |
+ source_object_.Get(), url, title, |
policy == OSExchangeData::CONVERT_FILENAMES ? true : false); |
if (success) { |
DCHECK(url->is_valid()); |
return true; |
- } else if (GetPlainTextURL(source_object_.get(), url)) { |
+ } else if (GetPlainTextURL(source_object_.Get(), url)) { |
if (url->is_valid()) |
*title = net::GetSuggestedFilename(*url, "", "", "", "", std::string()); |
else |
@@ -430,7 +430,7 @@ bool OSExchangeDataProviderWin::GetURLAndTitle( |
bool OSExchangeDataProviderWin::GetFilename(base::FilePath* path) const { |
std::vector<base::string16> filenames; |
- bool success = ClipboardUtil::GetFilenames(source_object_.get(), &filenames); |
+ bool success = ClipboardUtil::GetFilenames(source_object_.Get(), &filenames); |
if (success) |
*path = base::FilePath(filenames[0]); |
return success; |
@@ -440,7 +440,7 @@ bool OSExchangeDataProviderWin::GetFilenames( |
std::vector<FileInfo>* filenames) const { |
std::vector<base::string16> filenames_local; |
bool success = |
- ClipboardUtil::GetFilenames(source_object_.get(), &filenames_local); |
+ ClipboardUtil::GetFilenames(source_object_.Get(), &filenames_local); |
if (success) { |
for (size_t i = 0; i < filenames_local.size(); ++i) |
filenames->push_back( |
@@ -472,7 +472,7 @@ bool OSExchangeDataProviderWin::GetFileContents( |
base::FilePath* filename, |
std::string* file_contents) const { |
base::string16 filename_str; |
- if (!ClipboardUtil::GetFileContents(source_object_.get(), &filename_str, |
+ if (!ClipboardUtil::GetFileContents(source_object_.Get(), &filename_str, |
file_contents)) { |
return false; |
} |
@@ -483,34 +483,34 @@ bool OSExchangeDataProviderWin::GetFileContents( |
bool OSExchangeDataProviderWin::GetHtml(base::string16* html, |
GURL* base_url) const { |
std::string url; |
- bool success = ClipboardUtil::GetHtml(source_object_.get(), html, &url); |
+ bool success = ClipboardUtil::GetHtml(source_object_.Get(), html, &url); |
if (success) |
*base_url = GURL(url); |
return success; |
} |
bool OSExchangeDataProviderWin::HasString() const { |
- return ClipboardUtil::HasPlainText(source_object_.get()); |
+ return ClipboardUtil::HasPlainText(source_object_.Get()); |
} |
bool OSExchangeDataProviderWin::HasURL( |
OSExchangeData::FilenameToURLPolicy policy) const { |
return (ClipboardUtil::HasUrl( |
- source_object_.get(), |
+ source_object_.Get(), |
policy == OSExchangeData::CONVERT_FILENAMES ? true : false) || |
- HasPlainTextURL(source_object_.get())); |
+ HasPlainTextURL(source_object_.Get())); |
} |
bool OSExchangeDataProviderWin::HasFile() const { |
- return ClipboardUtil::HasFilenames(source_object_.get()); |
+ return ClipboardUtil::HasFilenames(source_object_.Get()); |
} |
bool OSExchangeDataProviderWin::HasFileContents() const { |
- return ClipboardUtil::HasFileContents(source_object_.get()); |
+ return ClipboardUtil::HasFileContents(source_object_.Get()); |
} |
bool OSExchangeDataProviderWin::HasHtml() const { |
- return ClipboardUtil::HasHtml(source_object_.get()); |
+ return ClipboardUtil::HasHtml(source_object_.Get()); |
} |
bool OSExchangeDataProviderWin::HasCustomFormat( |