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

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

Issue 1367303002: Update includes of mojo/edk to be fully-qualified instead of relative to third_party/mojo/src. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update all include guards Created 5 years, 2 months 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
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"
6 #include "mojo/edk/system/core.h"
7 #include "mojo/public/c/system/buffer.h" 5 #include "mojo/public/c/system/buffer.h"
8 #include "mojo/public/c/system/data_pipe.h" 6 #include "mojo/public/c/system/data_pipe.h"
9 #include "mojo/public/c/system/functions.h" 7 #include "mojo/public/c/system/functions.h"
10 #include "mojo/public/c/system/message_pipe.h" 8 #include "mojo/public/c/system/message_pipe.h"
9 #include "third_party/mojo/src/mojo/edk/embedder/embedder_internal.h"
10 #include "third_party/mojo/src/mojo/edk/system/core.h"
11 11
12 using mojo::embedder::internal::g_core; 12 using mojo::embedder::internal::g_core;
13 using mojo::system::MakeUserPointer; 13 using mojo::system::MakeUserPointer;
14 14
15 // Definitions of the system functions. 15 // Definitions of the system functions.
16 extern "C" { 16 extern "C" {
17 MojoTimeTicks MojoGetTimeTicksNow() { 17 MojoTimeTicks MojoGetTimeTicksNow() {
18 return g_core->GetTimeTicksNow(); 18 return g_core->GetTimeTicksNow();
19 } 19 }
20 20
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 MojoMapBufferFlags flags) { 146 MojoMapBufferFlags flags) {
147 return g_core->MapBuffer(buffer_handle, offset, num_bytes, 147 return g_core->MapBuffer(buffer_handle, offset, num_bytes,
148 MakeUserPointer(buffer), flags); 148 MakeUserPointer(buffer), flags);
149 } 149 }
150 150
151 MojoResult MojoUnmapBuffer(void* buffer) { 151 MojoResult MojoUnmapBuffer(void* buffer) {
152 return g_core->UnmapBuffer(MakeUserPointer(buffer)); 152 return g_core->UnmapBuffer(MakeUserPointer(buffer));
153 } 153 }
154 154
155 } // extern "C" 155 } // extern "C"
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698