| Index: mojo/examples/pepper_container_app/resource_creation_impl.h
|
| diff --git a/ppapi/proxy/resource_creation_proxy.h b/mojo/examples/pepper_container_app/resource_creation_impl.h
|
| similarity index 85%
|
| copy from ppapi/proxy/resource_creation_proxy.h
|
| copy to mojo/examples/pepper_container_app/resource_creation_impl.h
|
| index 4719c4a3028ef2cd466a5c4d10f3a17c1effe08e..de1760ea647243d899490c46885ef79d51ea6763 100644
|
| --- a/ppapi/proxy/resource_creation_proxy.h
|
| +++ b/mojo/examples/pepper_container_app/resource_creation_impl.h
|
| @@ -1,46 +1,28 @@
|
| -// Copyright (c) 2012 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 PPAPI_PROXY_RESOURCE_CREATION_PROXY_H_
|
| -#define PPAPI_PROXY_RESOURCE_CREATION_PROXY_H_
|
| +#ifndef MOJO_EXAMPLES_PEPPER_CONTAINER_APP_RESOURCE_CREATION_IMPL_H_
|
| +#define MOJO_EXAMPLES_PEPPER_CONTAINER_APP_RESOURCE_CREATION_IMPL_H_
|
|
|
| -#include <string>
|
| -
|
| -#include "base/basictypes.h"
|
| -#include "ipc/ipc_channel.h"
|
| -#include "ppapi/c/pp_bool.h"
|
| -#include "ppapi/c/pp_instance.h"
|
| -#include "ppapi/proxy/interface_proxy.h"
|
| -#include "ppapi/proxy/serialized_structs.h"
|
| +#include "base/compiler_specific.h"
|
| +#include "base/macros.h"
|
| +#include "build/build_config.h"
|
| #include "ppapi/thunk/resource_creation_api.h"
|
|
|
| -struct PP_Size;
|
| -
|
| -namespace ppapi {
|
| -
|
| -class HostResource;
|
| -
|
| -namespace proxy {
|
| +namespace mojo {
|
| +namespace examples {
|
|
|
| -struct Connection;
|
| -class Dispatcher;
|
| -
|
| -class ResourceCreationProxy : public InterfaceProxy,
|
| - public thunk::ResourceCreationAPI {
|
| +class ResourceCreationImpl : public ppapi::thunk::ResourceCreationAPI {
|
| public:
|
| - explicit ResourceCreationProxy(Dispatcher* dispatcher);
|
| - virtual ~ResourceCreationProxy();
|
| -
|
| - // Factory function used for registration (normal code can just use the
|
| - // constructor).
|
| - static InterfaceProxy* Create(Dispatcher* dispatcher);
|
| + ResourceCreationImpl();
|
| + virtual ~ResourceCreationImpl();
|
|
|
| - // ResourceCreationAPI (called in plugin).
|
| + // ppapi::thunk::ResourceCreationAPI implementation.
|
| virtual PP_Resource CreateFileIO(PP_Instance instance) OVERRIDE;
|
| virtual PP_Resource CreateFileRef(
|
| PP_Instance instance,
|
| - const FileRefCreateInfo& create_info) OVERRIDE;
|
| + const ppapi::FileRefCreateInfo& create_info) OVERRIDE;
|
| virtual PP_Resource CreateFileSystem(PP_Instance instance,
|
| PP_FileSystemType type) OVERRIDE;
|
| virtual PP_Resource CreateIMEInputEvent(PP_Instance instance,
|
| @@ -182,15 +164,11 @@ class ResourceCreationProxy : public InterfaceProxy,
|
| PP_VideoDecoder_Profile profile) OVERRIDE;
|
| #endif // !defined(OS_NACL)
|
|
|
| - virtual bool Send(IPC::Message* msg) OVERRIDE;
|
| - virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
|
| -
|
| private:
|
| - Connection GetConnection();
|
| - DISALLOW_COPY_AND_ASSIGN(ResourceCreationProxy);
|
| + DISALLOW_COPY_AND_ASSIGN(ResourceCreationImpl);
|
| };
|
|
|
| -} // namespace proxy
|
| -} // namespace ppapi
|
| +} // namespace examples
|
| +} // namespace mojo
|
|
|
| -#endif // PPAPI_PROXY_RESOURCE_CREATION_PROXY_H_
|
| +#endif // MOJO_EXAMPLES_PEPPER_CONTAINER_APP_RESOURCE_CREATION_IMPL_H_
|
|
|