| Index: mojo/edk/system/message_in_transit_queue.h
|
| diff --git a/third_party/mojo/src/mojo/edk/system/message_in_transit_queue.h b/mojo/edk/system/message_in_transit_queue.h
|
| similarity index 77%
|
| copy from third_party/mojo/src/mojo/edk/system/message_in_transit_queue.h
|
| copy to mojo/edk/system/message_in_transit_queue.h
|
| index c497341495f30c785e4d166c2f9512023acedf51..4a054900056b6fa17d379ab9472bd857c830d6c2 100644
|
| --- a/third_party/mojo/src/mojo/edk/system/message_in_transit_queue.h
|
| +++ b/mojo/edk/system/message_in_transit_queue.h
|
| @@ -2,18 +2,18 @@
|
| // 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_SYSTEM_MESSAGE_IN_TRANSIT_QUEUE_H_
|
| -#define THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_MESSAGE_IN_TRANSIT_QUEUE_H_
|
| +#ifndef MOJO_EDK_SYSTEM_MESSAGE_IN_TRANSIT_QUEUE_H_
|
| +#define MOJO_EDK_SYSTEM_MESSAGE_IN_TRANSIT_QUEUE_H_
|
|
|
| #include <deque>
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "mojo/edk/system/message_in_transit.h"
|
| +#include "mojo/edk/system/system_impl_export.h"
|
| #include "mojo/public/cpp/system/macros.h"
|
| -#include "third_party/mojo/src/mojo/edk/system/message_in_transit.h"
|
| -#include "third_party/mojo/src/mojo/edk/system/system_impl_export.h"
|
|
|
| namespace mojo {
|
| -namespace system {
|
| +namespace edk {
|
|
|
| // A simple queue for |MessageInTransit|s (that owns its messages).
|
| // This class is not thread-safe.
|
| @@ -56,7 +56,7 @@ class MOJO_SYSTEM_IMPL_EXPORT MessageInTransitQueue {
|
| MOJO_DISALLOW_COPY_AND_ASSIGN(MessageInTransitQueue);
|
| };
|
|
|
| -} // namespace system
|
| +} // namespace edk
|
| } // namespace mojo
|
|
|
| -#endif // THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_MESSAGE_IN_TRANSIT_QUEUE_H_
|
| +#endif // MOJO_EDK_SYSTEM_MESSAGE_IN_TRANSIT_QUEUE_H_
|
|
|