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

Unified Diff: ppapi/proxy/serialized_flash_menu.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 | « ppapi/proxy/resource_message_params.cc ('k') | ppapi/proxy/serialized_handle.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/serialized_flash_menu.cc
diff --git a/ppapi/proxy/serialized_flash_menu.cc b/ppapi/proxy/serialized_flash_menu.cc
index 9f39916ea611aad7b618c99fa005b66eb88d754f..cda9545c89db2909624973aba3835ef92759d9d3 100644
--- a/ppapi/proxy/serialized_flash_menu.cc
+++ b/ppapi/proxy/serialized_flash_menu.cc
@@ -20,7 +20,9 @@ const uint32_t kMaxMenuEntries = 1000;
bool CheckMenu(int depth, const PP_Flash_Menu* menu);
void FreeMenu(const PP_Flash_Menu* menu);
void WriteMenu(IPC::Message* m, const PP_Flash_Menu* menu);
-PP_Flash_Menu* ReadMenu(int depth, const IPC::Message* m, PickleIterator* iter);
+PP_Flash_Menu* ReadMenu(int depth,
+ const IPC::Message* m,
+ base::PickleIterator* iter);
bool CheckMenuItem(int depth, const PP_Flash_MenuItem* item) {
if (item->type == PP_FLASH_MENUITEM_TYPE_SUBMENU)
@@ -78,7 +80,7 @@ void FreeMenu(const PP_Flash_Menu* menu) {
bool ReadMenuItem(int depth,
const IPC::Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
PP_Flash_MenuItem* menu_item) {
uint32_t type;
if (!iter->ReadUInt32(&type))
@@ -108,7 +110,7 @@ bool ReadMenuItem(int depth,
PP_Flash_Menu* ReadMenu(int depth,
const IPC::Message* m,
- PickleIterator* iter) {
+ base::PickleIterator* iter) {
if (depth > kMaxMenuDepth)
return NULL;
++depth;
@@ -167,7 +169,7 @@ void SerializedFlashMenu::WriteToMessage(IPC::Message* m) const {
}
bool SerializedFlashMenu::ReadFromMessage(const IPC::Message* m,
- PickleIterator* iter) {
+ base::PickleIterator* iter) {
DCHECK(!pp_menu_);
pp_menu_ = ReadMenu(0, m, iter);
if (!pp_menu_)
« no previous file with comments | « ppapi/proxy/resource_message_params.cc ('k') | ppapi/proxy/serialized_handle.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698