mojo/public/platform/nacl/libmojo.cc - Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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 side-by-side diff with in-line comments

Download patch

Index: mojo/public/platform/nacl/libmojo.cc

diff --git a/third_party/mojo/src/mojo/public/platform/nacl/libmojo.cc b/mojo/public/platform/nacl/libmojo.cc

similarity index 98%

rename from third_party/mojo/src/mojo/public/platform/nacl/libmojo.cc

rename to mojo/public/platform/nacl/libmojo.cc

index e4d9f0067ec51fd5b95ccb67e63b074b0b1f393d..de0b495f65116ea7eff11cf6b16936aa053eb9e1 100644

--- a/third_party/mojo/src/mojo/public/platform/nacl/libmojo.cc

+++ b/mojo/public/platform/nacl/libmojo.cc

@@ -5,12 +5,12 @@

// WARNING this file was generated by generate_nacl_bindings.py

// Do not edit by hand.

+#include "mojo/public/c/system/core.h"

+#include "mojo/public/platform/nacl/mojo_irt.h"

#include "native_client/src/public/chrome_main.h"

#include "native_client/src/public/imc_syscalls.h"

#include "native_client/src/public/imc_types.h"

#include "native_client/src/untrusted/irt/irt.h"

-#include "third_party/mojo/src/mojo/public/c/system/core.h"

-#include "third_party/mojo/src/mojo/public/platform/nacl/mojo_irt.h"

// The value for this FD must not conflict with uses inside Chromium. However,

// mojo/nacl doesn't depend on any Chromium headers, so we can't use a #define

« 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 »