Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Unified Diff: ui/base/dragdrop/os_exchange_data_provider_win.cc

Issue 1154283003: Change most uses of Pickle to base::Pickle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/dragdrop/os_exchange_data_provider_mac.mm ('k') | ui/base/dragdrop/os_exchange_data_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ac57ffc1fc24e004ab57d44bd4f6d9b0a2cac616..0257d22e39a878a7041dd53c2a3a821d5f5dd092 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_win.cc
+++ b/ui/base/dragdrop/os_exchange_data_provider_win.cc
@@ -364,7 +364,7 @@ void OSExchangeDataProviderWin::SetFilenames(
void OSExchangeDataProviderWin::SetPickledData(
const OSExchangeData::CustomFormat& format,
- const Pickle& data) {
+ const base::Pickle& data) {
STGMEDIUM* storage = GetStorageForBytes(data.data(), data.size());
data_->contents_.push_back(
new DataObjectImpl::StoredDataInfo(format.ToFormatEtc(), storage));
@@ -449,7 +449,7 @@ bool OSExchangeDataProviderWin::GetFilenames(
bool OSExchangeDataProviderWin::GetPickledData(
const OSExchangeData::CustomFormat& format,
- Pickle* data) const {
+ base::Pickle* data) const {
DCHECK(data);
bool success = false;
STGMEDIUM medium;
@@ -458,7 +458,7 @@ bool OSExchangeDataProviderWin::GetPickledData(
if (medium.tymed & TYMED_HGLOBAL) {
base::win::ScopedHGlobal<char*> c_data(medium.hGlobal);
DCHECK_GT(c_data.Size(), 0u);
- *data = Pickle(c_data.get(), static_cast<int>(c_data.Size()));
+ *data = base::Pickle(c_data.get(), static_cast<int>(c_data.Size()));
success = true;
}
ReleaseStgMedium(&medium);
« no previous file with comments | « ui/base/dragdrop/os_exchange_data_provider_mac.mm ('k') | ui/base/dragdrop/os_exchange_data_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698