Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(443)

Side by Side Diff: mojo/public/platform/nacl/libmojo.cc

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « mojo/public/platform/nacl/DEPS ('k') | mojo/public/platform/nacl/mojo_initial_handle.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 // WARNING this file was generated by generate_nacl_bindings.py 5 // WARNING this file was generated by generate_nacl_bindings.py
6 // Do not edit by hand. 6 // Do not edit by hand.
7 7
8 #include "mojo/public/c/system/core.h"
9 #include "mojo/public/platform/nacl/mojo_irt.h"
8 #include "native_client/src/public/chrome_main.h" 10 #include "native_client/src/public/chrome_main.h"
9 #include "native_client/src/public/imc_syscalls.h" 11 #include "native_client/src/public/imc_syscalls.h"
10 #include "native_client/src/public/imc_types.h" 12 #include "native_client/src/public/imc_types.h"
11 #include "native_client/src/untrusted/irt/irt.h" 13 #include "native_client/src/untrusted/irt/irt.h"
12 #include "third_party/mojo/src/mojo/public/c/system/core.h"
13 #include "third_party/mojo/src/mojo/public/platform/nacl/mojo_irt.h"
14 14
15 // The value for this FD must not conflict with uses inside Chromium. However, 15 // The value for this FD must not conflict with uses inside Chromium. However,
16 // mojo/nacl doesn't depend on any Chromium headers, so we can't use a #define 16 // mojo/nacl doesn't depend on any Chromium headers, so we can't use a #define
17 // from there. 17 // from there.
18 #define NACL_MOJO_DESC (NACL_CHROME_DESC_BASE + 3) 18 #define NACL_MOJO_DESC (NACL_CHROME_DESC_BASE + 3)
19 19
20 bool g_irt_mojo_valid = false; 20 bool g_irt_mojo_valid = false;
21 struct nacl_irt_mojo g_irt_mojo; 21 struct nacl_irt_mojo g_irt_mojo;
22 22
23 struct nacl_irt_mojo* get_irt_mojo() { 23 struct nacl_irt_mojo* get_irt_mojo() {
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 handles, num_handles, flags); 218 handles, num_handles, flags);
219 } 219 }
220 220
221 MojoResult _MojoGetInitialHandle(MojoHandle* handle) { 221 MojoResult _MojoGetInitialHandle(MojoHandle* handle) {
222 struct nacl_irt_mojo* irt_mojo = get_irt_mojo(); 222 struct nacl_irt_mojo* irt_mojo = get_irt_mojo();
223 if (irt_mojo == NULL) 223 if (irt_mojo == NULL)
224 return MOJO_RESULT_INTERNAL; 224 return MOJO_RESULT_INTERNAL;
225 return irt_mojo->_MojoGetInitialHandle(handle); 225 return irt_mojo->_MojoGetInitialHandle(handle);
226 } 226 }
227 227
OLDNEW
« no previous file with comments | « mojo/public/platform/nacl/DEPS ('k') | mojo/public/platform/nacl/mojo_initial_handle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698