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

Unified Diff: ppapi/proxy/resource_message_params.h

Issue 1149113006: Move Pickle to base namespace. (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 | « ppapi/proxy/raw_var_data.h ('k') | ppapi/proxy/serialized_flash_menu.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/resource_message_params.h
diff --git a/ppapi/proxy/resource_message_params.h b/ppapi/proxy/resource_message_params.h
index da945b35d552ff90abca964418a3902c673d8884..500ebb908241efe74cd6010c8eca0eea5376eb3c 100644
--- a/ppapi/proxy/resource_message_params.h
+++ b/ppapi/proxy/resource_message_params.h
@@ -73,15 +73,15 @@ class PPAPI_PROXY_EXPORT ResourceMessageParams {
ResourceMessageParams(PP_Resource resource, int32_t sequence);
virtual void Serialize(IPC::Message* msg) const;
- virtual bool Deserialize(const IPC::Message* msg, PickleIterator* iter);
+ virtual bool Deserialize(const IPC::Message* msg, base::PickleIterator* iter);
// Writes everything except the handles to |msg|.
void WriteHeader(IPC::Message* msg) const;
// Writes the handles to |msg|.
void WriteHandles(IPC::Message* msg) const;
// Matching deserialize helpers.
- bool ReadHeader(const IPC::Message* msg, PickleIterator* iter);
- bool ReadHandles(const IPC::Message* msg, PickleIterator* iter);
+ bool ReadHeader(const IPC::Message* msg, base::PickleIterator* iter);
+ bool ReadHandles(const IPC::Message* msg, base::PickleIterator* iter);
private:
class PPAPI_PROXY_EXPORT SerializedHandles
@@ -145,7 +145,8 @@ class PPAPI_PROXY_EXPORT ResourceMessageCallParams
bool has_callback() const { return has_callback_; }
void Serialize(IPC::Message* msg) const override;
- bool Deserialize(const IPC::Message* msg, PickleIterator* iter) override;
+ bool Deserialize(const IPC::Message* msg,
+ base::PickleIterator* iter) override;
private:
bool has_callback_;
@@ -163,7 +164,8 @@ class PPAPI_PROXY_EXPORT ResourceMessageReplyParams
int32_t result() const { return result_; }
void Serialize(IPC::Message* msg) const override;
- bool Deserialize(const IPC::Message* msg, PickleIterator* iter) override;
+ bool Deserialize(const IPC::Message* msg,
+ base::PickleIterator* iter) override;
// Writes everything except the handles to |msg|.
void WriteReplyHeader(IPC::Message* msg) const;
@@ -184,7 +186,8 @@ ParamTraits<ppapi::proxy::ResourceMessageCallParams> {
static void Write(Message* m, const param_type& p) {
p.Serialize(m);
}
- static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
+ static bool Read(const Message* m, base::PickleIterator* iter,
+ param_type* r) {
return r->Deserialize(m, iter);
}
static void Log(const param_type& p, std::string* l) {
@@ -197,7 +200,8 @@ ParamTraits<ppapi::proxy::ResourceMessageReplyParams> {
static void Write(Message* m, const param_type& p) {
p.Serialize(m);
}
- static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
+ static bool Read(const Message* m, base::PickleIterator* iter,
+ param_type* r) {
return r->Deserialize(m, iter);
}
static void Log(const param_type& p, std::string* l) {
« no previous file with comments | « ppapi/proxy/raw_var_data.h ('k') | ppapi/proxy/serialized_flash_menu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698