| 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_readers.h" | 5 #include "ipc/mojo/ipc_channel_mojo_readers.h" |
| 6 | 6 |
| 7 #include "ipc/mojo/ipc_channel_mojo.h" | 7 #include "ipc/mojo/ipc_channel_mojo.h" |
| 8 #include "mojo/edk/embedder/embedder.h" | 8 #include "mojo/embedder/embedder.h" |
| 9 | 9 |
| 10 #if defined(OS_POSIX) && !defined(OS_NACL) | 10 #if defined(OS_POSIX) && !defined(OS_NACL) |
| 11 #include "ipc/file_descriptor_set_posix.h" | 11 #include "ipc/file_descriptor_set_posix.h" |
| 12 #endif | 12 #endif |
| 13 | 13 |
| 14 namespace IPC { | 14 namespace IPC { |
| 15 namespace internal { | 15 namespace internal { |
| 16 | 16 |
| 17 namespace { | 17 namespace { |
| 18 | 18 |
| (...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 312 | 312 |
| 313 MojoResult result = RespondHelloRequest(handle_buffer[0]); | 313 MojoResult result = RespondHelloRequest(handle_buffer[0]); |
| 314 if (result != MOJO_RESULT_OK) { | 314 if (result != MOJO_RESULT_OK) { |
| 315 DLOG(ERROR) << "Failed to respond Hello request. Closing: " << result; | 315 DLOG(ERROR) << "Failed to respond Hello request. Closing: " << result; |
| 316 CloseWithError(result); | 316 CloseWithError(result); |
| 317 } | 317 } |
| 318 } | 318 } |
| 319 | 319 |
| 320 } // namespace internal | 320 } // namespace internal |
| 321 } // namespace IPC | 321 } // namespace IPC |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 623883002:
Revert "Move mojo edk into mojo/edk" (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master