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 05:34:36 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-17 05:34:36 +0000
commitd978840b3799a139f284c413ffe79b03944afa5e (patch)
tree852096116256af73dcb5fb79c5c8406d3694d6ac /chrome/common/common_param_traits.cc
parent61bb694d38cc0d944c5cdd07ed44f6c72868e05e (diff)
downloadchromium_src-d978840b3799a139f284c413ffe79b03944afa5e.zip
chromium_src-d978840b3799a139f284c413ffe79b03944afa5e.tar.gz
chromium_src-d978840b3799a139f284c413ffe79b03944afa5e.tar.bz2
Revert "Implement web app definition parsing."
This reverts commit 24e3962db61243eea4976bead441c6206cd4f21e. TBR=aa@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66394 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 ca5e90b..2fd8bdd 100644
--- a/chrome/common/common_param_traits.cc
+++ b/chrome/common/common_param_traits.cc
@@ -9,7 +9,6 @@
#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"
@@ -19,6 +18,7 @@
#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<WebApplicationInfo>::Write(Message* m,
- const WebApplicationInfo& p) {
+void ParamTraits<webkit_glue::WebApplicationInfo>::Write(
+ Message* m, const webkit_glue::WebApplicationInfo& p) {
WriteParam(m, p.title);
WriteParam(m, p.description);
WriteParam(m, p.app_url);
@@ -240,8 +240,8 @@ void ParamTraits<WebApplicationInfo>::Write(Message* m,
}
}
-bool ParamTraits<WebApplicationInfo>::Read(
- const Message* m, void** iter, WebApplicationInfo* r) {
+bool ParamTraits<webkit_glue::WebApplicationInfo>::Read(
+ const Message* m, void** iter, webkit_glue::WebApplicationInfo* r) {
size_t icon_count;
bool result =
ReadParam(m, iter, &r->title) &&
@@ -263,8 +263,8 @@ bool ParamTraits<WebApplicationInfo>::Read(
return true;
}
-void ParamTraits<WebApplicationInfo>::Log(const WebApplicationInfo& p,
- std::string* l) {
+void ParamTraits<webkit_glue::WebApplicationInfo>::Log(
+ const webkit_glue::WebApplicationInfo& p, std::string* l) {
l->append("<WebApplicationInfo>");
}