third_party/mojo/src/mojo/edk/embedder/master_process_delegate.h - Issue 1179733005: Update mojo sdk to rev bdbb0c7e396fc4044a8b194058d7a7e529715286

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/master_process_delegate.h

Issue 1179733005: Update mojo sdk to rev bdbb0c7e396fc4044a8b194058d7a7e529715286 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: update CommandBufferImpl (Binding::OnConnectionError is no more) Created 5 years, 6 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 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/process_type.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 22ac435b35e0e40567e7546093de7d4f981b91c7..8f3ab3c778b31a70aea0e88405689dd0bea62094 100644

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

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

@@ -8,13 +8,12 @@

#include "base/macros.h"

#include "base/memory/scoped_ptr.h"

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

+#include "mojo/edk/embedder/slave_info.h"

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

namespace mojo {

namespace embedder {

-using SlaveInfo = void*;

// An interface for the master process delegate (which lives in the master

// process).

class MOJO_SYSTEM_IMPL_EXPORT MasterProcessDelegate : public ProcessDelegate {