OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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" |
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
349 | 349 |
350 struct ExternalTabSettings { | 350 struct ExternalTabSettings { |
351 gfx::NativeWindow parent; | 351 gfx::NativeWindow parent; |
352 gfx::Rect dimensions; | 352 gfx::Rect dimensions; |
353 unsigned int style; | 353 unsigned int style; |
354 bool is_off_the_record; | 354 bool is_off_the_record; |
355 bool load_requests_via_automation; | 355 bool load_requests_via_automation; |
356 bool handle_top_level_requests; | 356 bool handle_top_level_requests; |
357 GURL initial_url; | 357 GURL initial_url; |
358 GURL referrer; | 358 GURL referrer; |
| 359 bool infobars_enabled; |
359 }; | 360 }; |
360 | 361 |
361 // Traits for ExternalTabSettings structure to pack/unpack. | 362 // Traits for ExternalTabSettings structure to pack/unpack. |
362 template <> | 363 template <> |
363 struct ParamTraits<ExternalTabSettings> { | 364 struct ParamTraits<ExternalTabSettings> { |
364 typedef ExternalTabSettings param_type; | 365 typedef ExternalTabSettings param_type; |
365 static void Write(Message* m, const param_type& p) { | 366 static void Write(Message* m, const param_type& p) { |
366 WriteParam(m, p.parent); | 367 WriteParam(m, p.parent); |
367 WriteParam(m, p.dimensions); | 368 WriteParam(m, p.dimensions); |
368 WriteParam(m, p.style); | 369 WriteParam(m, p.style); |
369 WriteParam(m, p.is_off_the_record); | 370 WriteParam(m, p.is_off_the_record); |
370 WriteParam(m, p.load_requests_via_automation); | 371 WriteParam(m, p.load_requests_via_automation); |
371 WriteParam(m, p.handle_top_level_requests); | 372 WriteParam(m, p.handle_top_level_requests); |
372 WriteParam(m, p.initial_url); | 373 WriteParam(m, p.initial_url); |
373 WriteParam(m, p.referrer); | 374 WriteParam(m, p.referrer); |
| 375 WriteParam(m, p.infobars_enabled); |
374 } | 376 } |
375 static bool Read(const Message* m, void** iter, param_type* p) { | 377 static bool Read(const Message* m, void** iter, param_type* p) { |
376 return ReadParam(m, iter, &p->parent) && | 378 return ReadParam(m, iter, &p->parent) && |
377 ReadParam(m, iter, &p->dimensions) && | 379 ReadParam(m, iter, &p->dimensions) && |
378 ReadParam(m, iter, &p->style) && | 380 ReadParam(m, iter, &p->style) && |
379 ReadParam(m, iter, &p->is_off_the_record) && | 381 ReadParam(m, iter, &p->is_off_the_record) && |
380 ReadParam(m, iter, &p->load_requests_via_automation) && | 382 ReadParam(m, iter, &p->load_requests_via_automation) && |
381 ReadParam(m, iter, &p->handle_top_level_requests) && | 383 ReadParam(m, iter, &p->handle_top_level_requests) && |
382 ReadParam(m, iter, &p->initial_url) && | 384 ReadParam(m, iter, &p->initial_url) && |
383 ReadParam(m, iter, &p->referrer); | 385 ReadParam(m, iter, &p->referrer) && |
| 386 ReadParam(m, iter, &p->infobars_enabled); |
384 } | 387 } |
385 static void Log(const param_type& p, std::wstring* l) { | 388 static void Log(const param_type& p, std::wstring* l) { |
386 l->append(L"("); | 389 l->append(L"("); |
387 LogParam(p.parent, l); | 390 LogParam(p.parent, l); |
388 l->append(L", "); | 391 l->append(L", "); |
389 LogParam(p.dimensions, l); | 392 LogParam(p.dimensions, l); |
390 l->append(L", "); | 393 l->append(L", "); |
391 LogParam(p.style, l); | 394 LogParam(p.style, l); |
392 l->append(L", "); | 395 l->append(L", "); |
393 LogParam(p.is_off_the_record, l); | 396 LogParam(p.is_off_the_record, l); |
394 l->append(L", "); | 397 l->append(L", "); |
395 LogParam(p.load_requests_via_automation, l); | 398 LogParam(p.load_requests_via_automation, l); |
396 l->append(L", "); | 399 l->append(L", "); |
397 LogParam(p.handle_top_level_requests, l); | 400 LogParam(p.handle_top_level_requests, l); |
398 l->append(L", "); | 401 l->append(L", "); |
399 LogParam(p.initial_url, l); | 402 LogParam(p.initial_url, l); |
400 l->append(L", "); | 403 l->append(L", "); |
401 LogParam(p.referrer, l); | 404 LogParam(p.referrer, l); |
| 405 l->append(L", "); |
| 406 LogParam(p.infobars_enabled, l); |
402 l->append(L")"); | 407 l->append(L")"); |
403 } | 408 } |
404 }; | 409 }; |
405 | 410 |
406 struct NavigationInfo { | 411 struct NavigationInfo { |
407 int navigation_type; | 412 int navigation_type; |
408 int relative_offset; | 413 int relative_offset; |
409 int navigation_index; | 414 int navigation_index; |
410 std::wstring title; | 415 std::wstring title; |
411 GURL url; | 416 GURL url; |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
566 } | 571 } |
567 }; | 572 }; |
568 | 573 |
569 } // namespace IPC | 574 } // namespace IPC |
570 | 575 |
571 #define MESSAGES_INTERNAL_FILE \ | 576 #define MESSAGES_INTERNAL_FILE \ |
572 "chrome/test/automation/automation_messages_internal.h" | 577 "chrome/test/automation/automation_messages_internal.h" |
573 #include "ipc/ipc_message_macros.h" | 578 #include "ipc/ipc_message_macros.h" |
574 | 579 |
575 #endif // CHROME_TEST_AUTOMATION_AUTOMATION_MESSAGES_H__ | 580 #endif // CHROME_TEST_AUTOMATION_AUTOMATION_MESSAGES_H__ |
OLD | NEW |