| Index: mojo/system/platform_channel_pair.h
|
| diff --git a/mojo/system/platform_channel.h b/mojo/system/platform_channel_pair.h
|
| similarity index 77%
|
| copy from mojo/system/platform_channel.h
|
| copy to mojo/system/platform_channel_pair.h
|
| index 47e1e6ac99e38973ebc067d7fe6a3bbdcc68109a..215b96ee8204173d7b2fde65e1cc0ae2913dbf22 100644
|
| --- a/mojo/system/platform_channel.h
|
| +++ b/mojo/system/platform_channel_pair.h
|
| @@ -1,11 +1,11 @@
|
| -// Copyright 2013 The Chromium Authors. All rights reserved.
|
| +// Copyright 2014 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MOJO_SYSTEM_PLATFORM_CHANNEL_H_
|
| -#define MOJO_SYSTEM_PLATFORM_CHANNEL_H_
|
| +#ifndef MOJO_SYSTEM_PLATFORM_CHANNEL_PAIR_H_
|
| +#define MOJO_SYSTEM_PLATFORM_CHANNEL_PAIR_H_
|
|
|
| -#include "base/basictypes.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/process/launch.h"
|
| #include "mojo/system/platform_channel_handle.h"
|
| @@ -16,30 +16,7 @@ class CommandLine;
|
| namespace mojo {
|
| namespace system {
|
|
|
| -class MOJO_SYSTEM_IMPL_EXPORT PlatformChannel {
|
| - public:
|
| - virtual ~PlatformChannel();
|
| -
|
| - // Creates a channel if you already have the underlying handle for it, taking
|
| - // ownership of |handle|.
|
| - static scoped_ptr<PlatformChannel> CreateFromHandle(
|
| - const PlatformChannelHandle& handle);
|
| -
|
| - // Returns the channel's handle, passing ownership.
|
| - PlatformChannelHandle PassHandle();
|
| -
|
| - bool is_valid() const { return handle_.is_valid(); }
|
| -
|
| - protected:
|
| - PlatformChannel();
|
| -
|
| - PlatformChannelHandle* mutable_handle() { return &handle_; }
|
| -
|
| - private:
|
| - PlatformChannelHandle handle_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(PlatformChannel);
|
| -};
|
| +class PlatformChannel;
|
|
|
| // This is used to create a pair of connected |PlatformChannel|s. The resulting
|
| // channels can then be used in the same process (e.g., in tests) or between
|
| @@ -97,4 +74,4 @@ class MOJO_SYSTEM_IMPL_EXPORT PlatformChannelPair {
|
| } // namespace system
|
| } // namespace mojo
|
|
|
| -#endif // MOJO_SYSTEM_PLATFORM_CHANNEL_H_
|
| +#endif // MOJO_SYSTEM_PLATFORM_CHANNEL_PAIR_H_
|
|
|