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

Index: third_party/mojo/src/mojo/edk/system/memory.h

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

index b09eb801ed5007b9aa56df33ebaedf1c31b1daba..3e9f79aa9892ee47417058336c6409e4c80657a4 100644

--- a/third_party/mojo/src/mojo/edk/system/memory.h

+++ b/third_party/mojo/src/mojo/edk/system/memory.h

@@ -10,9 +10,9 @@

#include <string.h> // For |memcpy()|.

#include "base/memory/scoped_ptr.h"

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

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

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

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

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

namespace mojo {

namespace system {