| Index: third_party/mojo/src/mojo/edk/system/channel.h
|
| diff --git a/third_party/mojo/src/mojo/edk/system/channel.h b/third_party/mojo/src/mojo/edk/system/channel.h
|
| index 2f2ac6fe3f62f7219b126e90e097bb4a1c2d76b2..9feda954a3182f0fc84a0c79405109941336bf5c 100644
|
| --- a/third_party/mojo/src/mojo/edk/system/channel.h
|
| +++ b/third_party/mojo/src/mojo/edk/system/channel.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MOJO_EDK_SYSTEM_CHANNEL_H_
|
| -#define MOJO_EDK_SYSTEM_CHANNEL_H_
|
| +#ifndef THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_CHANNEL_H_
|
| +#define THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_CHANNEL_H_
|
|
|
| #include <stdint.h>
|
|
|
| @@ -13,16 +13,16 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/threading/thread_checker.h"
|
| -#include "mojo/edk/embedder/scoped_platform_handle.h"
|
| -#include "mojo/edk/system/channel_endpoint.h"
|
| -#include "mojo/edk/system/channel_endpoint_id.h"
|
| -#include "mojo/edk/system/incoming_endpoint.h"
|
| -#include "mojo/edk/system/message_in_transit.h"
|
| -#include "mojo/edk/system/mutex.h"
|
| -#include "mojo/edk/system/raw_channel.h"
|
| -#include "mojo/edk/system/system_impl_export.h"
|
| #include "mojo/public/c/system/types.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/channel_endpoint.h"
|
| +#include "third_party/mojo/src/mojo/edk/system/channel_endpoint_id.h"
|
| +#include "third_party/mojo/src/mojo/edk/system/incoming_endpoint.h"
|
| +#include "third_party/mojo/src/mojo/edk/system/message_in_transit.h"
|
| +#include "third_party/mojo/src/mojo/edk/system/mutex.h"
|
| +#include "third_party/mojo/src/mojo/edk/system/raw_channel.h"
|
| +#include "third_party/mojo/src/mojo/edk/system/system_impl_export.h"
|
|
|
| namespace mojo {
|
|
|
| @@ -283,4 +283,4 @@ class MOJO_SYSTEM_IMPL_EXPORT Channel final
|
| } // namespace system
|
| } // namespace mojo
|
|
|
| -#endif // MOJO_EDK_SYSTEM_CHANNEL_H_
|
| +#endif // THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_CHANNEL_H_
|
|
|