| Index: third_party/mojo/src/mojo/edk/embedder/embedder.h
|
| diff --git a/third_party/mojo/src/mojo/edk/embedder/embedder.h b/third_party/mojo/src/mojo/edk/embedder/embedder.h
|
| index 2514c7c72de224662535846aefb23ba5baccb68a..bdbd3ebab58f06fd90376c2c3ca0c55da93b2811 100644
|
| --- a/third_party/mojo/src/mojo/edk/embedder/embedder.h
|
| +++ b/third_party/mojo/src/mojo/edk/embedder/embedder.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_EMBEDDER_EMBEDDER_H_
|
| -#define MOJO_EDK_EMBEDDER_EMBEDDER_H_
|
| +#ifndef THIRD_PARTY_MOJO_SRC_MOJO_EDK_EMBEDDER_EMBEDDER_H_
|
| +#define THIRD_PARTY_MOJO_SRC_MOJO_EDK_EMBEDDER_EMBEDDER_H_
|
|
|
| #include <string>
|
|
|
| @@ -11,12 +11,12 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/task_runner.h"
|
| -#include "mojo/edk/embedder/channel_info_forward.h"
|
| -#include "mojo/edk/embedder/process_type.h"
|
| -#include "mojo/edk/embedder/scoped_platform_handle.h"
|
| -#include "mojo/edk/embedder/slave_info.h"
|
| -#include "mojo/edk/system/system_impl_export.h"
|
| #include "mojo/public/cpp/system/message_pipe.h"
|
| +#include "third_party/mojo/src/mojo/edk/embedder/channel_info_forward.h"
|
| +#include "third_party/mojo/src/mojo/edk/embedder/process_type.h"
|
| +#include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h"
|
| +#include "third_party/mojo/src/mojo/edk/embedder/slave_info.h"
|
| +#include "third_party/mojo/src/mojo/edk/system/system_impl_export.h"
|
|
|
| namespace mojo {
|
| namespace embedder {
|
| @@ -240,4 +240,4 @@ MOJO_SYSTEM_IMPL_EXPORT void WillDestroyChannelSoon(ChannelInfo* channel_info);
|
| } // namespace embedder
|
| } // namespace mojo
|
|
|
| -#endif // MOJO_EDK_EMBEDDER_EMBEDDER_H_
|
| +#endif // THIRD_PARTY_MOJO_SRC_MOJO_EDK_EMBEDDER_EMBEDDER_H_
|
|
|