| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // NOTE: New trait definitions that will be used by Chrome Frame must be placed | 5 // NOTE: New trait definitions that will be used by Chrome Frame must be placed |
| 6 // in common_param_traits2.cc. | 6 // in common_param_traits2.cc. |
| 7 | 7 |
| 8 #include "content/public/common/webkit_param_traits.h" | 8 #include "content/public/common/webkit_param_traits.h" |
| 9 | 9 |
| 10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
| 11 #include "content/public/common/common_param_traits.h" | 11 #include "content/public/common/common_param_traits.h" |
| 12 #include "content/public/common/content_constants.h" | 12 #include "content/public/common/content_constants.h" |
| 13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" | 13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" |
| 14 #include "webkit/glue/password_form.h" | 14 #include "webkit/forms/password_form.h" |
| 15 #include "webkit/glue/resource_loader_bridge.h" | 15 #include "webkit/glue/resource_loader_bridge.h" |
| 16 #include "webkit/plugins/npapi/plugin_host.h" | 16 #include "webkit/plugins/npapi/plugin_host.h" |
| 17 | 17 |
| 18 NPIdentifier_Param::NPIdentifier_Param() | 18 NPIdentifier_Param::NPIdentifier_Param() |
| 19 : identifier() { | 19 : identifier() { |
| 20 } | 20 } |
| 21 | 21 |
| 22 NPIdentifier_Param::~NPIdentifier_Param() { | 22 NPIdentifier_Param::~NPIdentifier_Param() { |
| 23 } | 23 } |
| 24 | 24 |
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 299 l->append("("); | 299 l->append("("); |
| 300 LogParam(p.name, l); l->append(", "); | 300 LogParam(p.name, l); l->append(", "); |
| 301 LogParam(p.path, l); l->append(", "); | 301 LogParam(p.path, l); l->append(", "); |
| 302 LogParam(p.version, l); l->append(", "); | 302 LogParam(p.version, l); l->append(", "); |
| 303 LogParam(p.desc, l); l->append(", "); | 303 LogParam(p.desc, l); l->append(", "); |
| 304 LogParam(p.mime_types, l); l->append(", "); | 304 LogParam(p.mime_types, l); l->append(", "); |
| 305 LogParam(p.type, l); | 305 LogParam(p.type, l); |
| 306 l->append(")"); | 306 l->append(")"); |
| 307 } | 307 } |
| 308 | 308 |
| 309 void ParamTraits<webkit_glue::PasswordForm>::Write(Message* m, | 309 void ParamTraits<webkit::forms::PasswordForm>::Write(Message* m, |
| 310 const param_type& p) { | 310 const param_type& p) { |
| 311 WriteParam(m, p.signon_realm); | 311 WriteParam(m, p.signon_realm); |
| 312 WriteParam(m, p.origin); | 312 WriteParam(m, p.origin); |
| 313 WriteParam(m, p.action); | 313 WriteParam(m, p.action); |
| 314 WriteParam(m, p.submit_element); | 314 WriteParam(m, p.submit_element); |
| 315 WriteParam(m, p.username_element); | 315 WriteParam(m, p.username_element); |
| 316 WriteParam(m, p.username_value); | 316 WriteParam(m, p.username_value); |
| 317 WriteParam(m, p.password_element); | 317 WriteParam(m, p.password_element); |
| 318 WriteParam(m, p.password_value); | 318 WriteParam(m, p.password_value); |
| 319 WriteParam(m, p.old_password_element); | 319 WriteParam(m, p.old_password_element); |
| 320 WriteParam(m, p.old_password_value); | 320 WriteParam(m, p.old_password_value); |
| 321 WriteParam(m, p.ssl_valid); | 321 WriteParam(m, p.ssl_valid); |
| 322 WriteParam(m, p.preferred); | 322 WriteParam(m, p.preferred); |
| 323 WriteParam(m, p.blacklisted_by_user); | 323 WriteParam(m, p.blacklisted_by_user); |
| 324 } | 324 } |
| 325 | 325 |
| 326 bool ParamTraits<webkit_glue::PasswordForm>::Read(const Message* m, void** iter, | 326 bool ParamTraits<webkit::forms::PasswordForm>::Read(const Message* m, |
| 327 param_type* p) { | 327 void** iter, |
| 328 param_type* p) { |
| 328 return | 329 return |
| 329 ReadParam(m, iter, &p->signon_realm) && | 330 ReadParam(m, iter, &p->signon_realm) && |
| 330 ReadParam(m, iter, &p->origin) && | 331 ReadParam(m, iter, &p->origin) && |
| 331 ReadParam(m, iter, &p->action) && | 332 ReadParam(m, iter, &p->action) && |
| 332 ReadParam(m, iter, &p->submit_element) && | 333 ReadParam(m, iter, &p->submit_element) && |
| 333 ReadParam(m, iter, &p->username_element) && | 334 ReadParam(m, iter, &p->username_element) && |
| 334 ReadParam(m, iter, &p->username_value) && | 335 ReadParam(m, iter, &p->username_value) && |
| 335 ReadParam(m, iter, &p->password_element) && | 336 ReadParam(m, iter, &p->password_element) && |
| 336 ReadParam(m, iter, &p->password_value) && | 337 ReadParam(m, iter, &p->password_value) && |
| 337 ReadParam(m, iter, &p->old_password_element) && | 338 ReadParam(m, iter, &p->old_password_element) && |
| 338 ReadParam(m, iter, &p->old_password_value) && | 339 ReadParam(m, iter, &p->old_password_value) && |
| 339 ReadParam(m, iter, &p->ssl_valid) && | 340 ReadParam(m, iter, &p->ssl_valid) && |
| 340 ReadParam(m, iter, &p->preferred) && | 341 ReadParam(m, iter, &p->preferred) && |
| 341 ReadParam(m, iter, &p->blacklisted_by_user); | 342 ReadParam(m, iter, &p->blacklisted_by_user); |
| 342 } | 343 } |
| 343 void ParamTraits<webkit_glue::PasswordForm>::Log(const param_type& p, | 344 void ParamTraits<webkit::forms::PasswordForm>::Log(const param_type& p, |
| 344 std::string* l) { | 345 std::string* l) { |
| 345 l->append("<PasswordForm>"); | 346 l->append("<PasswordForm>"); |
| 346 } | 347 } |
| 347 | 348 |
| 348 } // namespace IPC | 349 } // namespace IPC |
| OLD | NEW |