| Index: content/public/renderer/remote_proto_channel.h
|
| diff --git a/cc/trees/remote_proto_channel.h b/content/public/renderer/remote_proto_channel.h
|
| similarity index 58%
|
| rename from cc/trees/remote_proto_channel.h
|
| rename to content/public/renderer/remote_proto_channel.h
|
| index 8f7ad099a13a6754e93123081abd8b95c3191655..2d7ec6bcbc5cc4cb1aff14f57776f0733e8773f9 100644
|
| --- a/cc/trees/remote_proto_channel.h
|
| +++ b/content/public/renderer/remote_proto_channel.h
|
| @@ -2,31 +2,32 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CC_TREES_REMOTE_PROTO_CHANNEL_H_
|
| -#define CC_TREES_REMOTE_PROTO_CHANNEL_H_
|
| +#ifndef CONTENT_PUBLIC_RENDERER_REMOTE_PROTO_CHANNEL_H_
|
| +#define CONTENT_PUBLIC_RENDERER_REMOTE_PROTO_CHANNEL_H_
|
|
|
| #include <memory>
|
|
|
| -#include "cc/base/cc_export.h"
|
| +#include "content/common/content_export.h"
|
|
|
| namespace cc {
|
| -
|
| namespace proto {
|
| class CompositorMessage;
|
| -}
|
| +} // namespace proto
|
| +
|
| +} // namespace cc
|
| +
|
| +namespace content {
|
|
|
| // Provides a bridge for getting compositor protobuf messages to/from the
|
| -// outside world.
|
| -class CC_EXPORT RemoteProtoChannel {
|
| +// renderer and the browser.
|
| +class CONTENT_EXPORT RemoteProtoChannel {
|
| public:
|
| // Meant to be implemented by a RemoteChannel that needs to receive and parse
|
| // incoming protobufs.
|
| - class CC_EXPORT ProtoReceiver {
|
| + class CONTENT_EXPORT ProtoReceiver {
|
| public:
|
| - // TODO(khushalsagar): This should probably include a closure that returns
|
| - // the status of processing this proto. See crbug/576974
|
| virtual void OnProtoReceived(
|
| - std::unique_ptr<proto::CompositorMessage> proto) = 0;
|
| + std::unique_ptr<cc::proto::CompositorMessage> proto) = 0;
|
|
|
| protected:
|
| virtual ~ProtoReceiver() {}
|
| @@ -36,12 +37,13 @@ class CC_EXPORT RemoteProtoChannel {
|
| // receiver.
|
| virtual void SetProtoReceiver(ProtoReceiver* receiver) = 0;
|
|
|
| - virtual void SendCompositorProto(const proto::CompositorMessage& proto) = 0;
|
| + virtual void SendCompositorProto(
|
| + const cc::proto::CompositorMessage& proto) = 0;
|
|
|
| protected:
|
| virtual ~RemoteProtoChannel() {}
|
| };
|
|
|
| -} // namespace cc
|
| +} // namespace content
|
|
|
| -#endif // CC_TREES_REMOTE_PROTO_CHANNEL_H_
|
| +#endif // CONTENT_PUBLIC_RENDERER_REMOTE_PROTO_CHANNEL_H_
|
|
|