Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(188)

Unified Diff: mojo/edk/embedder/simple_platform_shared_buffer_android.cc

Issue 1350023003: Add a Mojo EDK for Chrome that uses one OS pipe per message pipe. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more cleanup Created 5 years, 3 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
Index: mojo/edk/embedder/simple_platform_shared_buffer_android.cc
diff --git a/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer_android.cc b/mojo/edk/embedder/simple_platform_shared_buffer_android.cc
similarity index 89%
copy from third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer_android.cc
copy to mojo/edk/embedder/simple_platform_shared_buffer_android.cc
index 34d11c5287df24c3ffcdb186cf8e94e7a66ca283..d8556044cd6c841256d67edd2bebc650703a0628 100644
--- a/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer_android.cc
+++ b/mojo/edk/embedder/simple_platform_shared_buffer_android.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer.h"
+#include "mojo/edk/embedder/simple_platform_shared_buffer.h"
#include <stdint.h>
#include <sys/mman.h> // For |PROT_...|.
@@ -12,11 +12,11 @@
#include "base/files/scoped_file.h"
#include "base/logging.h"
+#include "mojo/edk/embedder/platform_handle.h"
#include "third_party/ashmem/ashmem.h"
-#include "third_party/mojo/src/mojo/edk/embedder/platform_handle.h"
namespace mojo {
-namespace embedder {
+namespace edk {
// SimplePlatformSharedBuffer --------------------------------------------------
@@ -68,5 +68,5 @@ bool SimplePlatformSharedBuffer::InitFromPlatformHandle(
return true;
}
-} // namespace embedder
+} // namespace edk
} // namespace mojo

Powered by Google App Engine
This is Rietveld 408576698