third_party/mojo/src/mojo/edk/system/master_connection_manager.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/system/master_connection_manager.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/system/master_connection_manager.h ('k') | third_party/mojo/src/mojo/edk/system/memory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/mojo/src/mojo/edk/system/master_connection_manager.cc

diff --git a/third_party/mojo/src/mojo/edk/system/master_connection_manager.cc b/third_party/mojo/src/mojo/edk/system/master_connection_manager.cc

index 833abd36c1ff430a41fd3f1bfce40159c4ea6369..b72e8ee04c96d0dc9366058f01640e18fdefd07f 100644

--- a/third_party/mojo/src/mojo/edk/system/master_connection_manager.cc

+++ b/third_party/mojo/src/mojo/edk/system/master_connection_manager.cc

@@ -10,6 +10,7 @@

#include "base/logging.h"

#include "base/message_loop/message_loop.h"

#include "base/synchronization/waitable_event.h"

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

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

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

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

@@ -18,7 +19,6 @@

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

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

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

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

namespace mojo {

namespace system {

« no previous file with comments | « third_party/mojo/src/mojo/edk/system/master_connection_manager.h ('k') | third_party/mojo/src/mojo/edk/system/memory.h » ('j') | no next file with comments »