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

Unified Diff: chrome/common/common_param_traits.cc

Issue 4979003: Implement web app definition parsing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nacl64 build Created 10 years, 1 month 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
Index: chrome/common/common_param_traits.cc
diff --git a/chrome/common/common_param_traits.cc b/chrome/common/common_param_traits.cc
index 2fd8bdd9d8483e63860f780279836eafc9d4b7d6..ca5e90bbb748f9445c2adb85d2544482047d30dc 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>");
}

Powered by Google App Engine
This is Rietveld 408576698