third_party/mojo/src/mojo/edk/embedder/entrypoints.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: third_party/mojo/src/mojo/edk/embedder/entrypoints.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

« no previous file with comments | « third_party/mojo/src/mojo/edk/embedder/embedder_unittest.cc ('k') | third_party/mojo/src/mojo/edk/embedder/master_process_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/mojo/src/mojo/edk/embedder/entrypoints.cc

diff --git a/third_party/mojo/src/mojo/edk/embedder/entrypoints.cc b/third_party/mojo/src/mojo/edk/embedder/entrypoints.cc

index bc53093b64fe84bfa85067e489d9369dcbad755f..024b6d64c304dfa34cbb936044c043c3bd0309de 100644

--- a/third_party/mojo/src/mojo/edk/embedder/entrypoints.cc

+++ b/third_party/mojo/src/mojo/edk/embedder/entrypoints.cc

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

#include "../../../../../../mojo/edk/embedder/embedder_internal.h"

#include "../../../../../../mojo/edk/system/core.h"

#include "base/command_line.h"

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

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

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

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

#include "third_party/mojo/src/mojo/edk/embedder/embedder_internal.h"

#include "third_party/mojo/src/mojo/edk/system/core.h"

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

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

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

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

using mojo::embedder::internal::g_core;

using mojo::system::MakeUserPointer;