diff options
author | blundell <blundell@chromium.org> | 2015-01-19 09:18:33 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-19 17:19:27 +0000 |
commit | 70fb54767b472a5edfb859e489beeeec7abdb0e4 (patch) | |
tree | 28e534ec774391a9f6571a1770e12a0d63ebf833 /mojo/edk/system/proxy_message_pipe_endpoint.h | |
parent | ba5f0233fa38f949e24f6274ba891fa652eab640 (diff) | |
download | chromium_src-70fb54767b472a5edfb859e489beeeec7abdb0e4.zip chromium_src-70fb54767b472a5edfb859e489beeeec7abdb0e4.tar.gz chromium_src-70fb54767b472a5edfb859e489beeeec7abdb0e4.tar.bz2 |
Move //mojo/{public, edk} underneath //third_party
This CL move //mojo/public and //mojo/edk to live in the following locations:
- //third_party/mojo/src/mojo/public
- //third_party/mojo/src/mojo/edk
It moves the related gypfiles from //mojo to //third_party/mojo and updates
them as necessary to account for the file moves. It also updates clients of the
mojo SDK and EDK targets in both GYP and GN. (Note that for GN, the mojo SDK
and EDK build systems are maintained in the Mojo repo and designed to be
flexible wrt the location of the SDK/EDK in a client repo, so no changes are
needed.
This CL does not update include paths to the code being moved to limit the
number of moving parts, instead relying on the include_dirs that the SDK and
EDK targets supply to their direct dependents to ensure that include paths
continue to resolve correctly.
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/814543006
Cr-Commit-Position: refs/heads/master@{#312129}
Diffstat (limited to 'mojo/edk/system/proxy_message_pipe_endpoint.h')
-rw-r--r-- | mojo/edk/system/proxy_message_pipe_endpoint.h | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/mojo/edk/system/proxy_message_pipe_endpoint.h b/mojo/edk/system/proxy_message_pipe_endpoint.h deleted file mode 100644 index 6e10699..0000000 --- a/mojo/edk/system/proxy_message_pipe_endpoint.h +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright 2013 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_EDK_SYSTEM_PROXY_MESSAGE_PIPE_ENDPOINT_H_ -#define MOJO_EDK_SYSTEM_PROXY_MESSAGE_PIPE_ENDPOINT_H_ - -#include "base/macros.h" -#include "base/memory/ref_counted.h" -#include "mojo/edk/system/message_in_transit.h" -#include "mojo/edk/system/message_pipe_endpoint.h" -#include "mojo/edk/system/system_impl_export.h" - -namespace mojo { -namespace system { - -class ChannelEndpoint; -class LocalMessagePipeEndpoint; -class MessagePipe; - -// A |ProxyMessagePipeEndpoint| is an endpoint which delegates everything to a -// |ChannelEndpoint|, which may be co-owned by a |Channel|. Like any -// |MessagePipeEndpoint|, a |ProxyMessagePipeEndpoint| is owned by a -// |MessagePipe|. -// -// For example, a |MessagePipe| with one endpoint local and the other endpoint -// remote consists of a |LocalMessagePipeEndpoint| and a -// |ProxyMessagePipeEndpoint|, with only the local endpoint being accessible via -// a |MessagePipeDispatcher|. -class MOJO_SYSTEM_IMPL_EXPORT ProxyMessagePipeEndpoint - : public MessagePipeEndpoint { - public: - explicit ProxyMessagePipeEndpoint(ChannelEndpoint* channel_endpoint); - ~ProxyMessagePipeEndpoint() override; - - // Returns |channel_endpoint_| and resets |channel_endpoint_| to null. This - // may be called at most once, after which |Close()| need not be called. - // - // Note: The returned |ChannelEndpoint| must have its client changed while - // still under |MessagePipe|'s lock (which this must have also been called - // under). - scoped_refptr<ChannelEndpoint> ReleaseChannelEndpoint(); - - // |MessagePipeEndpoint| implementation: - Type GetType() const override; - bool OnPeerClose() override; - void EnqueueMessage(scoped_ptr<MessageInTransit> message) override; - void Close() override; - - private: - void DetachIfNecessary(); - - scoped_refptr<ChannelEndpoint> channel_endpoint_; - - DISALLOW_COPY_AND_ASSIGN(ProxyMessagePipeEndpoint); -}; - -} // namespace system -} // namespace mojo - -#endif // MOJO_EDK_SYSTEM_PROXY_MESSAGE_PIPE_ENDPOINT_H_ |