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

Unified Diff: chrome/browser/ui/views/extensions/browser_action_drag_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: chrome/browser/ui/views/extensions/browser_action_drag_data.cc
diff --git a/chrome/browser/ui/views/extensions/browser_action_drag_data.cc b/chrome/browser/ui/views/extensions/browser_action_drag_data.cc
index ce98094b727fd350efc21491a0a13ba0e9cef5d6..82f62c5dd679f7499a121c2a9a50f6e2ba41c940 100644
--- a/chrome/browser/ui/views/extensions/browser_action_drag_data.cc
+++ b/chrome/browser/ui/views/extensions/browser_action_drag_data.cc
@@ -50,7 +50,7 @@ bool BrowserActionDragData::IsFromProfile(const Profile* profile) const {
void BrowserActionDragData::Write(
Profile* profile, ui::OSExchangeData* data) const {
DCHECK(data);
- Pickle data_pickle;
+ base::Pickle data_pickle;
WriteToPickle(profile, &data_pickle);
data->SetPickledData(GetBrowserActionCustomFormat(), data_pickle);
}
@@ -59,7 +59,7 @@ bool BrowserActionDragData::Read(const ui::OSExchangeData& data) {
if (!data.HasCustomFormat(GetBrowserActionCustomFormat()))
return false;
- Pickle drag_data_pickle;
+ base::Pickle drag_data_pickle;
if (!data.GetPickledData(GetBrowserActionCustomFormat(), &drag_data_pickle))
return false;
@@ -81,15 +81,15 @@ BrowserActionDragData::GetBrowserActionCustomFormat() {
}
#endif
-void BrowserActionDragData::WriteToPickle(
- Profile* profile, base::Pickle* pickle) const {
+void BrowserActionDragData::WriteToPickle(Profile* profile,
+ base::Pickle* pickle) const {
pickle->WriteBytes(&profile, sizeof(profile));
pickle->WriteString(id_);
pickle->WriteUInt64(index_);
}
-bool BrowserActionDragData::ReadFromPickle(Pickle* pickle) {
- PickleIterator data_iterator(*pickle);
+bool BrowserActionDragData::ReadFromPickle(base::Pickle* pickle) {
+ base::PickleIterator data_iterator(*pickle);
const char* tmp;
if (!data_iterator.ReadBytes(&tmp, sizeof(profile_)))
« no previous file with comments | « chrome/browser/ui/app_list/test/fast_show_pickler_unittest.cc ('k') | chrome/common/content_settings_pattern_serializer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698