OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #ifndef CHROME_TEST_AUTOMATION_AUTOMATION_MESSAGES_H__ | 5 #ifndef CHROME_TEST_AUTOMATION_AUTOMATION_MESSAGES_H__ |
6 #define CHROME_TEST_AUTOMATION_AUTOMATION_MESSAGES_H__ | 6 #define CHROME_TEST_AUTOMATION_AUTOMATION_MESSAGES_H__ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
11 #include "chrome/browser/tab_contents/navigation_entry.h" | 11 #include "chrome/browser/tab_contents/navigation_entry.h" |
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
445 } | 445 } |
446 }; | 446 }; |
447 | 447 |
448 struct NavigationInfo { | 448 struct NavigationInfo { |
449 int navigation_type; | 449 int navigation_type; |
450 int relative_offset; | 450 int relative_offset; |
451 int navigation_index; | 451 int navigation_index; |
452 std::wstring title; | 452 std::wstring title; |
453 GURL url; | 453 GURL url; |
454 SecurityStyle security_style; | 454 SecurityStyle security_style; |
455 bool has_mixed_content; | 455 bool displayed_mixed_content; |
| 456 bool ran_mixed_content; |
456 }; | 457 }; |
457 | 458 |
458 // Traits for NavigationInfo structure to pack/unpack. | 459 // Traits for NavigationInfo structure to pack/unpack. |
459 template <> | 460 template <> |
460 struct ParamTraits<NavigationInfo> { | 461 struct ParamTraits<NavigationInfo> { |
461 typedef NavigationInfo param_type; | 462 typedef NavigationInfo param_type; |
462 static void Write(Message* m, const param_type& p) { | 463 static void Write(Message* m, const param_type& p) { |
463 WriteParam(m, p.navigation_type); | 464 WriteParam(m, p.navigation_type); |
464 WriteParam(m, p.relative_offset); | 465 WriteParam(m, p.relative_offset); |
465 WriteParam(m, p.navigation_index); | 466 WriteParam(m, p.navigation_index); |
466 WriteParam(m, p.title); | 467 WriteParam(m, p.title); |
467 WriteParam(m, p.url); | 468 WriteParam(m, p.url); |
468 WriteParam(m, p.security_style); | 469 WriteParam(m, p.security_style); |
469 WriteParam(m, p.has_mixed_content); | 470 WriteParam(m, p.displayed_mixed_content); |
| 471 WriteParam(m, p.ran_mixed_content); |
470 } | 472 } |
471 static bool Read(const Message* m, void** iter, param_type* p) { | 473 static bool Read(const Message* m, void** iter, param_type* p) { |
472 return ReadParam(m, iter, &p->navigation_type) && | 474 return ReadParam(m, iter, &p->navigation_type) && |
473 ReadParam(m, iter, &p->relative_offset) && | 475 ReadParam(m, iter, &p->relative_offset) && |
474 ReadParam(m, iter, &p->navigation_index) && | 476 ReadParam(m, iter, &p->navigation_index) && |
475 ReadParam(m, iter, &p->title) && | 477 ReadParam(m, iter, &p->title) && |
476 ReadParam(m, iter, &p->url) && | 478 ReadParam(m, iter, &p->url) && |
477 ReadParam(m, iter, &p->security_style) && | 479 ReadParam(m, iter, &p->security_style) && |
478 ReadParam(m, iter, &p->has_mixed_content); | 480 ReadParam(m, iter, &p->displayed_mixed_content) && |
| 481 ReadParam(m, iter, &p->ran_mixed_content); |
479 } | 482 } |
480 static void Log(const param_type& p, std::wstring* l) { | 483 static void Log(const param_type& p, std::wstring* l) { |
481 l->append(L"("); | 484 l->append(L"("); |
482 LogParam(p.navigation_type, l); | 485 LogParam(p.navigation_type, l); |
483 l->append(L", "); | 486 l->append(L", "); |
484 LogParam(p.relative_offset, l); | 487 LogParam(p.relative_offset, l); |
485 l->append(L", "); | 488 l->append(L", "); |
486 LogParam(p.navigation_index, l); | 489 LogParam(p.navigation_index, l); |
487 l->append(L", "); | 490 l->append(L", "); |
488 LogParam(p.title, l); | 491 LogParam(p.title, l); |
489 l->append(L", "); | 492 l->append(L", "); |
490 LogParam(p.url, l); | 493 LogParam(p.url, l); |
491 l->append(L", "); | 494 l->append(L", "); |
492 LogParam(p.security_style, l); | 495 LogParam(p.security_style, l); |
493 l->append(L", "); | 496 l->append(L", "); |
494 LogParam(p.has_mixed_content, l); | 497 LogParam(p.displayed_mixed_content, l); |
| 498 l->append(L", "); |
| 499 LogParam(p.ran_mixed_content, l); |
495 l->append(L")"); | 500 l->append(L")"); |
496 } | 501 } |
497 }; | 502 }; |
498 | 503 |
499 // A stripped down version of ContextMenuParams in webkit/glue/context_menu.h. | 504 // A stripped down version of ContextMenuParams in webkit/glue/context_menu.h. |
500 struct ContextMenuParams { | 505 struct ContextMenuParams { |
501 // The x coordinate for displaying the menu. | 506 // The x coordinate for displaying the menu. |
502 int screen_x; | 507 int screen_x; |
503 | 508 |
504 // The y coordinate for displaying the menu. | 509 // The y coordinate for displaying the menu. |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
608 } | 613 } |
609 }; | 614 }; |
610 | 615 |
611 } // namespace IPC | 616 } // namespace IPC |
612 | 617 |
613 #define MESSAGES_INTERNAL_FILE \ | 618 #define MESSAGES_INTERNAL_FILE \ |
614 "chrome/test/automation/automation_messages_internal.h" | 619 "chrome/test/automation/automation_messages_internal.h" |
615 #include "ipc/ipc_message_macros.h" | 620 #include "ipc/ipc_message_macros.h" |
616 | 621 |
617 #endif // CHROME_TEST_AUTOMATION_AUTOMATION_MESSAGES_H__ | 622 #endif // CHROME_TEST_AUTOMATION_AUTOMATION_MESSAGES_H__ |
OLD | NEW |