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

Unified Diff: ui/base/dragdrop/os_exchange_data_provider_mac.mm

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
Index: ui/base/dragdrop/os_exchange_data_provider_mac.mm
diff --git a/ui/base/dragdrop/os_exchange_data_provider_mac.mm b/ui/base/dragdrop/os_exchange_data_provider_mac.mm
index 94e4bed9c32e82d7ea934bc8bfb878116d50d385..dcc93a08f85652bb2c573b1890f79b53be468b8d 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_mac.mm
+++ b/ui/base/dragdrop/os_exchange_data_provider_mac.mm
@@ -63,7 +63,7 @@ void OSExchangeDataProviderMac::SetFilenames(
void OSExchangeDataProviderMac::SetPickledData(
const OSExchangeData::CustomFormat& format,
- const Pickle& data) {
+ const base::Pickle& data) {
NSData* ns_data = [NSData dataWithBytes:data.data() length:data.size()];
[pasteboard_ setData:ns_data forType:format.ToNSString()];
}
@@ -126,13 +126,14 @@ bool OSExchangeDataProviderMac::GetFilenames(
bool OSExchangeDataProviderMac::GetPickledData(
const OSExchangeData::CustomFormat& format,
- Pickle* data) const {
+ base::Pickle* data) const {
DCHECK(data);
NSData* ns_data = [pasteboard_ dataForType:format.ToNSString()];
if (!ns_data)
return false;
- *data = Pickle(static_cast<const char*>([ns_data bytes]), [ns_data length]);
+ *data =
+ base::Pickle(static_cast<const char*>([ns_data bytes]), [ns_data length]);
return true;
}
« no previous file with comments | « ui/base/dragdrop/os_exchange_data_provider_aurax11.cc ('k') | ui/base/dragdrop/os_exchange_data_provider_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698