Index: chrome/common/common_param_traits.h |
diff --git a/chrome/common/common_param_traits.h b/chrome/common/common_param_traits.h |
index 0ca6bed17d2d656ccd5910aa5b57db1358f48b10..4df65363a3451e5fb3e4aa1b1bbfeb43f23b02e5 100644 |
--- a/chrome/common/common_param_traits.h |
+++ b/chrome/common/common_param_traits.h |
@@ -23,7 +23,6 @@ |
#include "net/base/upload_data.h" |
#include "net/url_request/url_request_status.h" |
#include "printing/native_metafile.h" |
-#include "webkit/glue/password_form.h" |
#include "webkit/glue/webcursor.h" |
#include "webkit/glue/window_open_disposition.h" |
@@ -34,6 +33,7 @@ class DictionaryValue; |
class ListValue; |
struct ThumbnailScore; |
class URLRequestStatus; |
+class WebCursor; |
namespace gfx { |
class Point; |
@@ -210,7 +210,7 @@ struct ParamTraits<WebCursor> { |
static void Write(Message* m, const param_type& p) { |
p.Serialize(m); |
} |
- static bool Read(const Message* m, void** iter, param_type* r) { |
+ static bool Read(const Message* m, void** iter, param_type* r) { |
return r->Deserialize(m, iter); |
} |
static void Log(const param_type& p, std::wstring* l) { |
@@ -368,49 +368,16 @@ struct ParamTraits<Geoposition::ErrorCode> { |
template <> |
struct ParamTraits<webkit_glue::PasswordForm> { |
typedef webkit_glue::PasswordForm param_type; |
- static void Write(Message* m, const param_type& p) { |
- WriteParam(m, p.signon_realm); |
- WriteParam(m, p.origin); |
- WriteParam(m, p.action); |
- WriteParam(m, p.submit_element); |
- WriteParam(m, p.username_element); |
- WriteParam(m, p.username_value); |
- WriteParam(m, p.password_element); |
- WriteParam(m, p.password_value); |
- WriteParam(m, p.old_password_element); |
- WriteParam(m, p.old_password_value); |
- WriteParam(m, p.ssl_valid); |
- WriteParam(m, p.preferred); |
- WriteParam(m, p.blacklisted_by_user); |
- } |
- static bool Read(const Message* m, void** iter, param_type* p) { |
- return |
- ReadParam(m, iter, &p->signon_realm) && |
- ReadParam(m, iter, &p->origin) && |
- ReadParam(m, iter, &p->action) && |
- ReadParam(m, iter, &p->submit_element) && |
- ReadParam(m, iter, &p->username_element) && |
- ReadParam(m, iter, &p->username_value) && |
- ReadParam(m, iter, &p->password_element) && |
- ReadParam(m, iter, &p->password_value) && |
- ReadParam(m, iter, &p->old_password_element) && |
- ReadParam(m, iter, &p->old_password_value) && |
- ReadParam(m, iter, &p->ssl_valid) && |
- ReadParam(m, iter, &p->preferred) && |
- ReadParam(m, iter, &p->blacklisted_by_user); |
- } |
- static void Log(const param_type& p, std::wstring* l) { |
- l->append(L"<PasswordForm>"); |
- } |
+ static void Write(Message* m, const param_type& p); |
+ static bool Read(const Message* m, void** iter, param_type* p); |
+ static void Log(const param_type& p, std::wstring* l); |
}; |
template <> |
struct ParamTraits<printing::PageRange> { |
typedef printing::PageRange param_type; |
static void Write(Message* m, const param_type& p); |
- |
static bool Read(const Message* m, void** iter, param_type* r); |
- |
static void Log(const param_type& p, std::wstring* l); |
}; |
@@ -418,9 +385,7 @@ template <> |
struct ParamTraits<printing::NativeMetafile> { |
typedef printing::NativeMetafile param_type; |
static void Write(Message* m, const param_type& p); |
- |
static bool Read(const Message* m, void** iter, param_type* r); |
- |
static void Log(const param_type& p, std::wstring* l); |
}; |