summaryrefslogtreecommitdiffstats
path: root/chrome/common/common_param_traits.cc
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-26 21:50:23 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-26 21:50:23 +0000
commitbb461530cb42d050c91bacc9ec1a6a48100c6be7 (patch)
tree8b88b90958fdd1d2dcdc666b4414a93ca833c97e /chrome/common/common_param_traits.cc
parent11740d25bd6ac9c9da9ceb99ba1ba59d3caabeeb (diff)
downloadchromium_src-bb461530cb42d050c91bacc9ec1a6a48100c6be7.zip
chromium_src-bb461530cb42d050c91bacc9ec1a6a48100c6be7.tar.gz
chromium_src-bb461530cb42d050c91bacc9ec1a6a48100c6be7.tar.bz2
Revert "Revert "Finish wiring up chrome.app.install().""
This reverts commit 89f4de523e9c916950f72c264cdefed662849124. TBR=aa@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67474 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/common_param_traits.cc')
-rw-r--r--chrome/common/common_param_traits.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/common/common_param_traits.cc b/chrome/common/common_param_traits.cc
index ca5e90b..165224c 100644
--- a/chrome/common/common_param_traits.cc
+++ b/chrome/common/common_param_traits.cc
@@ -237,6 +237,7 @@ void ParamTraits<WebApplicationInfo>::Write(Message* m,
WriteParam(m, p.icons[i].url);
WriteParam(m, p.icons[i].width);
WriteParam(m, p.icons[i].height);
+ WriteParam(m, p.icons[i].data);
}
}
@@ -255,7 +256,8 @@ bool ParamTraits<WebApplicationInfo>::Read(
result =
ReadParam(m, iter, &icon_info.url) &&
ReadParam(m, iter, &icon_info.width) &&
- ReadParam(m, iter, &icon_info.height);
+ ReadParam(m, iter, &icon_info.height) &&
+ ReadParam(m, iter, &icon_info.data);
if (!result)
return false;
r->icons.push_back(icon_info);