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

Unified Diff: ui/base/clipboard/custom_data_helper.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
« no previous file with comments | « tools/android/forwarder2/host_forwarder_main.cc ('k') | ui/base/clipboard/custom_data_helper_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/clipboard/custom_data_helper.cc
diff --git a/ui/base/clipboard/custom_data_helper.cc b/ui/base/clipboard/custom_data_helper.cc
index b71544646a129009127e01beaa01488f7da107af..a50a0a072c712ce347e30466e3bddcdee5432525 100644
--- a/ui/base/clipboard/custom_data_helper.cc
+++ b/ui/base/clipboard/custom_data_helper.cc
@@ -16,17 +16,17 @@ namespace ui {
namespace {
-class SkippablePickle : public Pickle {
+class SkippablePickle : public base::Pickle {
public:
SkippablePickle(const void* data, size_t data_len);
- bool SkipString16(PickleIterator* iter);
+ bool SkipString16(base::PickleIterator* iter);
};
SkippablePickle::SkippablePickle(const void* data, size_t data_len)
- : Pickle(reinterpret_cast<const char*>(data), data_len) {
+ : base::Pickle(reinterpret_cast<const char*>(data), data_len) {
}
-bool SkippablePickle::SkipString16(PickleIterator* iter) {
+bool SkippablePickle::SkipString16(base::PickleIterator* iter) {
DCHECK(iter);
int len;
@@ -41,7 +41,7 @@ void ReadCustomDataTypes(const void* data,
size_t data_length,
std::vector<base::string16>* types) {
SkippablePickle pickle(data, data_length);
- PickleIterator iter(pickle);
+ base::PickleIterator iter(pickle);
size_t size = 0;
if (!iter.ReadSizeT(&size))
@@ -66,7 +66,7 @@ void ReadCustomDataForType(const void* data,
const base::string16& type,
base::string16* result) {
SkippablePickle pickle(data, data_length);
- PickleIterator iter(pickle);
+ base::PickleIterator iter(pickle);
size_t size = 0;
if (!iter.ReadSizeT(&size))
@@ -88,8 +88,8 @@ void ReadCustomDataForType(const void* data,
void ReadCustomDataIntoMap(const void* data,
size_t data_length,
std::map<base::string16, base::string16>* result) {
- Pickle pickle(reinterpret_cast<const char*>(data), data_length);
- PickleIterator iter(pickle);
+ base::Pickle pickle(reinterpret_cast<const char*>(data), data_length);
+ base::PickleIterator iter(pickle);
size_t size = 0;
if (!iter.ReadSizeT(&size))
@@ -114,7 +114,7 @@ void ReadCustomDataIntoMap(const void* data,
void WriteCustomDataToPickle(
const std::map<base::string16, base::string16>& data,
- Pickle* pickle) {
+ base::Pickle* pickle) {
pickle->WriteSizeT(data.size());
for (std::map<base::string16, base::string16>::const_iterator it =
data.begin();
« no previous file with comments | « tools/android/forwarder2/host_forwarder_main.cc ('k') | ui/base/clipboard/custom_data_helper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698