| Index: mojo/edk/embedder/platform_shared_buffer.h
|
| diff --git a/third_party/mojo/src/mojo/edk/embedder/platform_shared_buffer.h b/mojo/edk/embedder/platform_shared_buffer.h
|
| similarity index 90%
|
| copy from third_party/mojo/src/mojo/edk/embedder/platform_shared_buffer.h
|
| copy to mojo/edk/embedder/platform_shared_buffer.h
|
| index da22cf54fd68696b0174e48e4646461c60fdb3a3..c7256afc71b9087c65bc31e3df9848ee113ffb53 100644
|
| --- a/third_party/mojo/src/mojo/edk/embedder/platform_shared_buffer.h
|
| +++ b/mojo/edk/embedder/platform_shared_buffer.h
|
| @@ -2,19 +2,19 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef THIRD_PARTY_MOJO_SRC_MOJO_EDK_EMBEDDER_PLATFORM_SHARED_BUFFER_H_
|
| -#define THIRD_PARTY_MOJO_SRC_MOJO_EDK_EMBEDDER_PLATFORM_SHARED_BUFFER_H_
|
| +#ifndef MOJO_EDK_EMBEDDER_PLATFORM_SHARED_BUFFER_H_
|
| +#define MOJO_EDK_EMBEDDER_PLATFORM_SHARED_BUFFER_H_
|
|
|
| #include <stddef.h>
|
|
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "mojo/edk/embedder/scoped_platform_handle.h"
|
| +#include "mojo/edk/system/system_impl_export.h"
|
| #include "mojo/public/cpp/system/macros.h"
|
| -#include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h"
|
| -#include "third_party/mojo/src/mojo/edk/system/system_impl_export.h"
|
|
|
| namespace mojo {
|
| -namespace embedder {
|
| +namespace edk {
|
|
|
| class PlatformSharedBufferMapping;
|
|
|
| @@ -96,7 +96,7 @@ class MOJO_SYSTEM_IMPL_EXPORT PlatformSharedBufferMapping {
|
| MOJO_DISALLOW_COPY_AND_ASSIGN(PlatformSharedBufferMapping);
|
| };
|
|
|
| -} // namespace embedder
|
| +} // namespace edk
|
| } // namespace mojo
|
|
|
| -#endif // THIRD_PARTY_MOJO_SRC_MOJO_EDK_EMBEDDER_PLATFORM_SHARED_BUFFER_H_
|
| +#endif // MOJO_EDK_EMBEDDER_PLATFORM_SHARED_BUFFER_H_
|
|
|