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

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/mojom_bindings_generator_variables.gypi ('k') | third_party/mojo/src/mojo/edk/embedder/embedder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/mojo/src/mojo/edk/embedder/embedder.h

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

index 140b0da6dedc1846654a4c71a4227e7c9398cb05..ba8948113de15a71c9e8426e6c0ea4bdb06ccb32 100644

--- a/third_party/mojo/src/mojo/edk/embedder/embedder.h

+++ b/third_party/mojo/src/mojo/edk/embedder/embedder.h

@@ -11,12 +11,12 @@

#include "base/memory/ref_counted.h"

#include "base/memory/scoped_ptr.h"

#include "base/task_runner.h"

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

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

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

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

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

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

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

namespace mojo {

namespace embedder {