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

Unified Diff: components/bookmarks/browser/bookmark_node_data.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: components/bookmarks/browser/bookmark_node_data.cc
diff --git a/components/bookmarks/browser/bookmark_node_data.cc b/components/bookmarks/browser/bookmark_node_data.cc
index a781516fbf9c4440d4fde98d85272b17ec5b58f8..36b1bdd11edfc71518b265f5a9ca31d7ddce4956 100644
--- a/components/bookmarks/browser/bookmark_node_data.cc
+++ b/components/bookmarks/browser/bookmark_node_data.cc
@@ -37,7 +37,7 @@ BookmarkNodeData::Element::Element(const BookmarkNode* node)
BookmarkNodeData::Element::~Element() {
}
-void BookmarkNodeData::Element::WriteToPickle(Pickle* pickle) const {
+void BookmarkNodeData::Element::WriteToPickle(base::Pickle* pickle) const {
pickle->WriteBool(is_url);
pickle->WriteString(url.spec());
pickle->WriteString16(title);
@@ -57,7 +57,7 @@ void BookmarkNodeData::Element::WriteToPickle(Pickle* pickle) const {
}
}
-bool BookmarkNodeData::Element::ReadFromPickle(PickleIterator* iterator) {
+bool BookmarkNodeData::Element::ReadFromPickle(base::PickleIterator* iterator) {
std::string url_spec;
if (!iterator->ReadBool(&is_url) ||
!iterator->ReadString(&url_spec) ||
@@ -194,7 +194,7 @@ void BookmarkNodeData::WriteToClipboard(ui::ClipboardType clipboard_type) {
scw.WriteText(text);
}
- Pickle pickle;
+ base::Pickle pickle;
WriteToPickle(base::FilePath(), &pickle);
scw.WritePickledData(pickle,
ui::Clipboard::GetFormatType(kClipboardFormatString));
@@ -208,7 +208,7 @@ bool BookmarkNodeData::ReadFromClipboard(ui::ClipboardType type) {
&data);
if (!data.empty()) {
- Pickle pickle(data.data(), static_cast<int>(data.size()));
+ base::Pickle pickle(data.data(), static_cast<int>(data.size()));
if (ReadFromPickle(&pickle))
return true;
}
@@ -232,7 +232,7 @@ bool BookmarkNodeData::ReadFromClipboard(ui::ClipboardType type) {
#endif
void BookmarkNodeData::WriteToPickle(const base::FilePath& profile_path,
- Pickle* pickle) const {
+ base::Pickle* pickle) const {
profile_path.WriteToPickle(pickle);
pickle->WriteSizeT(size());
@@ -240,8 +240,8 @@ void BookmarkNodeData::WriteToPickle(const base::FilePath& profile_path,
elements[i].WriteToPickle(pickle);
}
-bool BookmarkNodeData::ReadFromPickle(Pickle* pickle) {
- PickleIterator data_iterator(*pickle);
+bool BookmarkNodeData::ReadFromPickle(base::Pickle* pickle) {
+ base::PickleIterator data_iterator(*pickle);
size_t element_count;
if (profile_path_.ReadFromPickle(&data_iterator) &&
data_iterator.ReadSizeT(&element_count)) {
« no previous file with comments | « components/autofill/core/common/form_field_data_unittest.cc ('k') | components/bookmarks/browser/bookmark_node_data_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698