| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/mojo/ipc_channel_mojo.h" | 5 #include "ipc/mojo/ipc_channel_mojo.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
| 11 #include "base/thread_task_runner_handle.h" | 11 #include "base/thread_task_runner_handle.h" |
| 12 #include "ipc/ipc_listener.h" | 12 #include "ipc/ipc_listener.h" |
| 13 #include "ipc/ipc_logging.h" | 13 #include "ipc/ipc_logging.h" |
| 14 #include "ipc/ipc_message_attachment_set.h" | 14 #include "ipc/ipc_message_attachment_set.h" |
| 15 #include "ipc/ipc_message_macros.h" | 15 #include "ipc/ipc_message_macros.h" |
| 16 #include "ipc/mojo/client_channel.mojom.h" | 16 #include "ipc/mojo/client_channel.mojom.h" |
| 17 #include "ipc/mojo/ipc_mojo_bootstrap.h" | 17 #include "ipc/mojo/ipc_mojo_bootstrap.h" |
| 18 #include "ipc/mojo/ipc_mojo_handle_attachment.h" | 18 #include "ipc/mojo/ipc_mojo_handle_attachment.h" |
| 19 #include "mojo/edk/embedder/embedder.h" | 19 #include "mojo/edk/embedder/embedder.h" |
| 20 #include "mojo/public/cpp/bindings/binding.h" |
| 20 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" | 21 #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" |
| 21 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" | |
| 22 | 22 |
| 23 #if defined(OS_POSIX) && !defined(OS_NACL) | 23 #if defined(OS_POSIX) && !defined(OS_NACL) |
| 24 #include "ipc/ipc_platform_file_attachment_posix.h" | 24 #include "ipc/ipc_platform_file_attachment_posix.h" |
| 25 #endif | 25 #endif |
| 26 | 26 |
| 27 namespace IPC { | 27 namespace IPC { |
| 28 | 28 |
| 29 namespace { | 29 namespace { |
| 30 | 30 |
| 31 // TODO(jam): do more tests on using channel on same thread if it supports it ( | 31 // TODO(jam): do more tests on using channel on same thread if it supports it ( |
| (...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 541 if (!ok) { | 541 if (!ok) { |
| 542 LOG(ERROR) << "Failed to add new Mojo handle."; | 542 LOG(ERROR) << "Failed to add new Mojo handle."; |
| 543 return MOJO_RESULT_UNKNOWN; | 543 return MOJO_RESULT_UNKNOWN; |
| 544 } | 544 } |
| 545 } | 545 } |
| 546 | 546 |
| 547 return MOJO_RESULT_OK; | 547 return MOJO_RESULT_OK; |
| 548 } | 548 } |
| 549 | 549 |
| 550 } // namespace IPC | 550 } // namespace IPC |
| OLD | NEW |