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

Side by Side Diff: mojo/edk/embedder/entrypoints.cc

Issue 1435063002: Eliminate third_party/mojo/src from all targets' include paths (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/edk/embedder/embedder_unittest.cc ('k') | mojo/edk/embedder/platform_channel_pair.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 #include "mojo/edk/embedder/embedder_internal.h" 5 #include "mojo/edk/embedder/embedder_internal.h"
6 #include "mojo/edk/system/core.h" 6 #include "mojo/edk/system/core.h"
7 #include "mojo/public/c/system/buffer.h" 7 #include "third_party/mojo/src/mojo/public/c/system/buffer.h"
8 #include "mojo/public/c/system/data_pipe.h" 8 #include "third_party/mojo/src/mojo/public/c/system/data_pipe.h"
9 #include "mojo/public/c/system/functions.h" 9 #include "third_party/mojo/src/mojo/public/c/system/functions.h"
10 #include "mojo/public/c/system/message_pipe.h" 10 #include "third_party/mojo/src/mojo/public/c/system/message_pipe.h"
11 11
12 using mojo::edk::internal::g_core; 12 using mojo::edk::internal::g_core;
13 13
14 // TODO(use_chrome_edk): commented out since for now we use the entrypoints in 14 // TODO(use_chrome_edk): commented out since for now we use the entrypoints in
15 // third_party and that checks the command line to redirect here. 15 // third_party and that checks the command line to redirect here.
16 /* 16 /*
17 17
18 // Definitions of the system functions. 18 // Definitions of the system functions.
19 extern "C" { 19 extern "C" {
20 MojoTimeTicks MojoGetTimeTicksNow() { 20 MojoTimeTicks MojoGetTimeTicksNow() {
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 MojoMapBufferFlags flags) { 140 MojoMapBufferFlags flags) {
141 return g_core->MapBuffer(buffer_handle, offset, num_bytes, buffer, flags); 141 return g_core->MapBuffer(buffer_handle, offset, num_bytes, buffer, flags);
142 } 142 }
143 143
144 MojoResult MojoUnmapBuffer(void* buffer) { 144 MojoResult MojoUnmapBuffer(void* buffer) {
145 return g_core->UnmapBuffer(buffer); 145 return g_core->UnmapBuffer(buffer);
146 } 146 }
147 147
148 } // extern "C" 148 } // extern "C"
149 */ 149 */
OLDNEW
« no previous file with comments | « mojo/edk/embedder/embedder_unittest.cc ('k') | mojo/edk/embedder/platform_channel_pair.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698