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

Unified Diff: ui/base/dragdrop/os_exchange_data_provider_aurax11.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
Index: ui/base/dragdrop/os_exchange_data_provider_aurax11.cc
diff --git a/ui/base/dragdrop/os_exchange_data_provider_aurax11.cc b/ui/base/dragdrop/os_exchange_data_provider_aurax11.cc
index 714069fecd9e52bde99ef0427ba837a02d5bfd7a..c9285a02b18c1d8f89639c311218d774ea5ad5c4 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_aurax11.cc
+++ b/ui/base/dragdrop/os_exchange_data_provider_aurax11.cc
@@ -206,7 +206,7 @@ void OSExchangeDataProviderAuraX11::SetFilenames(
void OSExchangeDataProviderAuraX11::SetPickledData(
const OSExchangeData::CustomFormat& format,
- const Pickle& pickle) {
+ const base::Pickle& pickle) {
const unsigned char* data =
reinterpret_cast<const unsigned char*>(pickle.data());
@@ -324,7 +324,7 @@ bool OSExchangeDataProviderAuraX11::GetFilenames(
bool OSExchangeDataProviderAuraX11::GetPickledData(
const OSExchangeData::CustomFormat& format,
- Pickle* pickle) const {
+ base::Pickle* pickle) const {
std::vector< ::Atom> requested_types;
requested_types.push_back(atom_cache_.GetAtom(format.ToString().c_str()));
@@ -332,8 +332,8 @@ bool OSExchangeDataProviderAuraX11::GetPickledData(
if (data.IsValid()) {
// Note that the pickle object on the right hand side of the assignment
// only refers to the bytes in |data|. The assignment copies the data.
- *pickle = Pickle(reinterpret_cast<const char*>(data.GetData()),
- static_cast<int>(data.GetSize()));
+ *pickle = base::Pickle(reinterpret_cast<const char*>(data.GetData()),
+ static_cast<int>(data.GetSize()));
return true;
}
« no previous file with comments | « ui/base/dragdrop/os_exchange_data_provider_aura.cc ('k') | ui/base/dragdrop/os_exchange_data_provider_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698