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-17 06:03:44 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-17 06:03:44 +0000
commit38789d8b022117628f26ddf3d4abe9c47c98d574 (patch)
treebfd1d1446a3e8c7409d687597db0db3831c19e5e /chrome/common/common_param_traits.cc
parentd978840b3799a139f284c413ffe79b03944afa5e (diff)
downloadchromium_src-38789d8b022117628f26ddf3d4abe9c47c98d574.zip
chromium_src-38789d8b022117628f26ddf3d4abe9c47c98d574.tar.gz
chromium_src-38789d8b022117628f26ddf3d4abe9c47c98d574.tar.bz2
Revert "Revert "Implement web app definition parsing.""
This reverts commit 8d410ce0aae7acbbcd816425ba49e79d8d7b9a1d. TBR=aa@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66398 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/common_param_traits.cc')
-rw-r--r--chrome/common/common_param_traits.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/common/common_param_traits.cc b/chrome/common/common_param_traits.cc
index 2fd8bdd..ca5e90b 100644
--- a/chrome/common/common_param_traits.cc
+++ b/chrome/common/common_param_traits.cc
@@ -9,6 +9,7 @@
#include "chrome/common/content_settings.h"
#include "chrome/common/geoposition.h"
#include "chrome/common/thumbnail_score.h"
+#include "chrome/common/web_apps.h"
#include "gfx/rect.h"
#include "googleurl/src/gurl.h"
#include "net/base/upload_data.h"
@@ -18,7 +19,6 @@
#ifndef EXCLUDE_SKIA_DEPENDENCIES
#include "third_party/skia/include/core/SkBitmap.h"
#endif
-#include "webkit/glue/dom_operations.h"
#include "webkit/glue/password_form.h"
namespace IPC {
@@ -227,8 +227,8 @@ void ParamTraits<ContentSettings>::Log(
l->append("<ContentSettings>");
}
-void ParamTraits<webkit_glue::WebApplicationInfo>::Write(
- Message* m, const webkit_glue::WebApplicationInfo& p) {
+void ParamTraits<WebApplicationInfo>::Write(Message* m,
+ const WebApplicationInfo& p) {
WriteParam(m, p.title);
WriteParam(m, p.description);
WriteParam(m, p.app_url);
@@ -240,8 +240,8 @@ void ParamTraits<webkit_glue::WebApplicationInfo>::Write(
}
}
-bool ParamTraits<webkit_glue::WebApplicationInfo>::Read(
- const Message* m, void** iter, webkit_glue::WebApplicationInfo* r) {
+bool ParamTraits<WebApplicationInfo>::Read(
+ const Message* m, void** iter, WebApplicationInfo* r) {
size_t icon_count;
bool result =
ReadParam(m, iter, &r->title) &&
@@ -263,8 +263,8 @@ bool ParamTraits<webkit_glue::WebApplicationInfo>::Read(
return true;
}
-void ParamTraits<webkit_glue::WebApplicationInfo>::Log(
- const webkit_glue::WebApplicationInfo& p, std::string* l) {
+void ParamTraits<WebApplicationInfo>::Log(const WebApplicationInfo& p,
+ std::string* l) {
l->append("<WebApplicationInfo>");
}