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 #include "ipc/ipc_message_utils.h" | 5 #include "ipc/ipc_message_utils.h" |
6 | 6 |
7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
8 #include "base/json/json_writer.h" | 8 #include "base/json/json_writer.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/nullable_string16.h" | 10 #include "base/nullable_string16.h" |
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
445 #if defined(OS_POSIX) | 445 #if defined(OS_POSIX) |
446 && ReadParam(m, iter, &r->socket) | 446 && ReadParam(m, iter, &r->socket) |
447 #endif | 447 #endif |
448 ; | 448 ; |
449 } | 449 } |
450 | 450 |
451 void ParamTraits<IPC::ChannelHandle>::Log(const param_type& p, | 451 void ParamTraits<IPC::ChannelHandle>::Log(const param_type& p, |
452 std::string* l) { | 452 std::string* l) { |
453 l->append(StringPrintf("ChannelHandle(%s", p.name.c_str())); | 453 l->append(StringPrintf("ChannelHandle(%s", p.name.c_str())); |
454 #if defined(OS_POSIX) | 454 #if defined(OS_POSIX) |
| 455 l->append(", "); |
455 ParamTraits<base::FileDescriptor>::Log(p.socket, l); | 456 ParamTraits<base::FileDescriptor>::Log(p.socket, l); |
456 #endif | 457 #endif |
457 l->append(")"); | 458 l->append(")"); |
458 } | 459 } |
459 | 460 |
460 LogData::LogData() | 461 LogData::LogData() |
461 : routing_id(0), | 462 : routing_id(0), |
462 type(0), | 463 type(0), |
463 sent(0), | 464 sent(0), |
464 receive(0), | 465 receive(0), |
(...skipping 23 matching lines...) Expand all Loading... |
488 ReadParam(m, iter, &r->flags) && | 489 ReadParam(m, iter, &r->flags) && |
489 ReadParam(m, iter, &r->sent) && | 490 ReadParam(m, iter, &r->sent) && |
490 ReadParam(m, iter, &r->receive) && | 491 ReadParam(m, iter, &r->receive) && |
491 ReadParam(m, iter, &r->dispatch) && | 492 ReadParam(m, iter, &r->dispatch) && |
492 ReadParam(m, iter, &r->params); | 493 ReadParam(m, iter, &r->params); |
493 r->type = static_cast<uint16>(type); | 494 r->type = static_cast<uint16>(type); |
494 return result; | 495 return result; |
495 } | 496 } |
496 | 497 |
497 } // namespace IPC | 498 } // namespace IPC |
OLD | NEW |