| Index: mojo/edk/embedder/platform_channel_pair.h
|
| diff --git a/third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h b/mojo/edk/embedder/platform_channel_pair.h
|
| similarity index 89%
|
| copy from third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h
|
| copy to mojo/edk/embedder/platform_channel_pair.h
|
| index fa322269e4d382cae3b8b755e52aee0a02f9a5b1..74878370fa99423219894ed42ebc868d54b36fe6 100644
|
| --- a/third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h
|
| +++ b/mojo/edk/embedder/platform_channel_pair.h
|
| @@ -2,22 +2,22 @@
|
| // 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_CHANNEL_PAIR_H_
|
| -#define THIRD_PARTY_MOJO_SRC_MOJO_EDK_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_
|
| +#ifndef MOJO_EDK_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_
|
| +#define MOJO_EDK_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/process/launch.h"
|
| #include "build/build_config.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 base {
|
| class CommandLine;
|
| }
|
|
|
| namespace mojo {
|
| -namespace embedder {
|
| +namespace edk {
|
|
|
| // It would be nice to refactor base/process/launch.h to have a more platform-
|
| // independent way of representing handles that are passed to child processes.
|
| @@ -88,7 +88,7 @@ class MOJO_SYSTEM_IMPL_EXPORT PlatformChannelPair {
|
| MOJO_DISALLOW_COPY_AND_ASSIGN(PlatformChannelPair);
|
| };
|
|
|
| -} // namespace embedder
|
| +} // namespace edk
|
| } // namespace mojo
|
|
|
| -#endif // THIRD_PARTY_MOJO_SRC_MOJO_EDK_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_
|
| +#endif // MOJO_EDK_EMBEDDER_PLATFORM_CHANNEL_PAIR_H_
|
|
|