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

Unified Diff: content/browser/web_contents/web_contents_view_aura.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: content/browser/web_contents/web_contents_view_aura.cc
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index 705fbb912c35fae2df8d56ee1010dfea2b765838..258a128b1ec472288091a400833c33e2f8b5f11b 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -229,7 +229,7 @@ const ui::OSExchangeData::CustomFormat& GetFileSystemFileCustomFormat() {
// Writes file system files to the pickle.
void WriteFileSystemFilesToPickle(
const std::vector<DropData::FileSystemFileInfo>& file_system_files,
- Pickle* pickle) {
+ base::Pickle* pickle) {
pickle->WriteSizeT(file_system_files.size());
for (size_t i = 0; i < file_system_files.size(); ++i) {
pickle->WriteString(file_system_files[i].url.spec());
@@ -239,9 +239,9 @@ void WriteFileSystemFilesToPickle(
// Reads file system files from the pickle.
bool ReadFileSystemFilesFromPickle(
- const Pickle& pickle,
+ const base::Pickle& pickle,
std::vector<DropData::FileSystemFileInfo>* file_system_files) {
- PickleIterator iter(pickle);
+ base::PickleIterator iter(pickle);
size_t num_files = 0;
if (!iter.ReadSizeT(&num_files))
@@ -295,12 +295,12 @@ void PrepareDragData(const DropData& drop_data,
if (!drop_data.filenames.empty())
provider->SetFilenames(drop_data.filenames);
if (!drop_data.file_system_files.empty()) {
- Pickle pickle;
+ base::Pickle pickle;
WriteFileSystemFilesToPickle(drop_data.file_system_files, &pickle);
provider->SetPickledData(GetFileSystemFileCustomFormat(), pickle);
}
if (!drop_data.custom_data.empty()) {
- Pickle pickle;
+ base::Pickle pickle;
ui::WriteCustomDataToPickle(drop_data.custom_data, &pickle);
provider->SetPickledData(ui::Clipboard::GetWebCustomDataFormatType(),
pickle);
@@ -335,7 +335,7 @@ void PrepareDropData(DropData* drop_data, const ui::OSExchangeData& data) {
data.GetFilenames(&drop_data->filenames);
- Pickle pickle;
+ base::Pickle pickle;
std::vector<DropData::FileSystemFileInfo> file_system_files;
if (data.GetPickledData(GetFileSystemFileCustomFormat(), &pickle) &&
ReadFileSystemFilesFromPickle(pickle, &file_system_files))
« no previous file with comments | « content/browser/renderer_host/sandbox_ipc_linux.cc ('k') | content/browser/web_contents/web_drag_source_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698