OLD | NEW |
1 // Copyright (c) 2010 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 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
385 struct ExternalTabSettings { | 385 struct ExternalTabSettings { |
386 gfx::NativeWindow parent; | 386 gfx::NativeWindow parent; |
387 gfx::Rect dimensions; | 387 gfx::Rect dimensions; |
388 unsigned int style; | 388 unsigned int style; |
389 bool is_off_the_record; | 389 bool is_off_the_record; |
390 bool load_requests_via_automation; | 390 bool load_requests_via_automation; |
391 bool handle_top_level_requests; | 391 bool handle_top_level_requests; |
392 GURL initial_url; | 392 GURL initial_url; |
393 GURL referrer; | 393 GURL referrer; |
394 bool infobars_enabled; | 394 bool infobars_enabled; |
| 395 bool route_all_top_level_navigations; |
395 }; | 396 }; |
396 | 397 |
397 // Traits for ExternalTabSettings structure to pack/unpack. | 398 // Traits for ExternalTabSettings structure to pack/unpack. |
398 template <> | 399 template <> |
399 struct ParamTraits<ExternalTabSettings> { | 400 struct ParamTraits<ExternalTabSettings> { |
400 typedef ExternalTabSettings param_type; | 401 typedef ExternalTabSettings param_type; |
401 static void Write(Message* m, const param_type& p) { | 402 static void Write(Message* m, const param_type& p) { |
402 WriteParam(m, p.parent); | 403 WriteParam(m, p.parent); |
403 WriteParam(m, p.dimensions); | 404 WriteParam(m, p.dimensions); |
404 WriteParam(m, p.style); | 405 WriteParam(m, p.style); |
405 WriteParam(m, p.is_off_the_record); | 406 WriteParam(m, p.is_off_the_record); |
406 WriteParam(m, p.load_requests_via_automation); | 407 WriteParam(m, p.load_requests_via_automation); |
407 WriteParam(m, p.handle_top_level_requests); | 408 WriteParam(m, p.handle_top_level_requests); |
408 WriteParam(m, p.initial_url); | 409 WriteParam(m, p.initial_url); |
409 WriteParam(m, p.referrer); | 410 WriteParam(m, p.referrer); |
410 WriteParam(m, p.infobars_enabled); | 411 WriteParam(m, p.infobars_enabled); |
| 412 WriteParam(m, p.route_all_top_level_navigations); |
411 } | 413 } |
412 static bool Read(const Message* m, void** iter, param_type* p) { | 414 static bool Read(const Message* m, void** iter, param_type* p) { |
413 return ReadParam(m, iter, &p->parent) && | 415 return ReadParam(m, iter, &p->parent) && |
414 ReadParam(m, iter, &p->dimensions) && | 416 ReadParam(m, iter, &p->dimensions) && |
415 ReadParam(m, iter, &p->style) && | 417 ReadParam(m, iter, &p->style) && |
416 ReadParam(m, iter, &p->is_off_the_record) && | 418 ReadParam(m, iter, &p->is_off_the_record) && |
417 ReadParam(m, iter, &p->load_requests_via_automation) && | 419 ReadParam(m, iter, &p->load_requests_via_automation) && |
418 ReadParam(m, iter, &p->handle_top_level_requests) && | 420 ReadParam(m, iter, &p->handle_top_level_requests) && |
419 ReadParam(m, iter, &p->initial_url) && | 421 ReadParam(m, iter, &p->initial_url) && |
420 ReadParam(m, iter, &p->referrer) && | 422 ReadParam(m, iter, &p->referrer) && |
421 ReadParam(m, iter, &p->infobars_enabled); | 423 ReadParam(m, iter, &p->infobars_enabled) && |
| 424 ReadParam(m, iter, &p->route_all_top_level_navigations); |
422 } | 425 } |
423 static void Log(const param_type& p, std::string* l) { | 426 static void Log(const param_type& p, std::string* l) { |
424 l->append("("); | 427 l->append("("); |
425 LogParam(p.parent, l); | 428 LogParam(p.parent, l); |
426 l->append(", "); | 429 l->append(", "); |
427 LogParam(p.dimensions, l); | 430 LogParam(p.dimensions, l); |
428 l->append(", "); | 431 l->append(", "); |
429 LogParam(p.style, l); | 432 LogParam(p.style, l); |
430 l->append(", "); | 433 l->append(", "); |
431 LogParam(p.is_off_the_record, l); | 434 LogParam(p.is_off_the_record, l); |
432 l->append(", "); | 435 l->append(", "); |
433 LogParam(p.load_requests_via_automation, l); | 436 LogParam(p.load_requests_via_automation, l); |
434 l->append(", "); | 437 l->append(", "); |
435 LogParam(p.handle_top_level_requests, l); | 438 LogParam(p.handle_top_level_requests, l); |
436 l->append(", "); | 439 l->append(", "); |
437 LogParam(p.initial_url, l); | 440 LogParam(p.initial_url, l); |
438 l->append(", "); | 441 l->append(", "); |
439 LogParam(p.referrer, l); | 442 LogParam(p.referrer, l); |
440 l->append(", "); | 443 l->append(", "); |
441 LogParam(p.infobars_enabled, l); | 444 LogParam(p.infobars_enabled, l); |
| 445 l->append(", "); |
| 446 LogParam(p.route_all_top_level_navigations, l); |
442 l->append(")"); | 447 l->append(")"); |
443 } | 448 } |
444 }; | 449 }; |
445 | 450 |
446 struct NavigationInfo { | 451 struct NavigationInfo { |
447 int navigation_type; | 452 int navigation_type; |
448 int relative_offset; | 453 int relative_offset; |
449 int navigation_index; | 454 int navigation_index; |
450 std::wstring title; | 455 std::wstring title; |
451 GURL url; | 456 GURL url; |
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
621 } | 626 } |
622 }; | 627 }; |
623 | 628 |
624 } // namespace IPC | 629 } // namespace IPC |
625 | 630 |
626 #define MESSAGES_INTERNAL_FILE \ | 631 #define MESSAGES_INTERNAL_FILE \ |
627 "chrome/test/automation/automation_messages_internal.h" | 632 "chrome/test/automation/automation_messages_internal.h" |
628 #include "ipc/ipc_message_macros.h" | 633 #include "ipc/ipc_message_macros.h" |
629 | 634 |
630 #endif // CHROME_TEST_AUTOMATION_AUTOMATION_MESSAGES_H__ | 635 #endif // CHROME_TEST_AUTOMATION_AUTOMATION_MESSAGES_H__ |
OLD | NEW |