Commit ac12399c authored by brettw@chromium.org's avatar brettw@chromium.org

Convert file ref private to use new registration.

This removes some manual registration code. It should also make FileRef private
work in process, it didn't look like it was being registered for in-process use
before.

Review URL: http://codereview.chromium.org/8772027

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112740 0039d316-1c4b-4281-b951-d872f2087c98
parent f2e1da2a
......@@ -171,15 +171,18 @@ InterfaceList::InterfaceList() {
AddFlashInterfaces();
// PPB (browser) interfaces.
// Do not add more stuff here, they should be added to interface_list*.h
// TODO(brettw) remove these.
AddPPB(PPB_FileChooser_Proxy::GetTrustedInfo());
AddPPB(PPB_Instance_Proxy::GetInfoPrivate());
AddPPB(PPB_PDF_Proxy::GetInfo());
AddPPB(PPB_Testing_Proxy::GetInfo());
AddPPB(PPB_URLLoader_Proxy::GetTrustedInfo());
AddPPB(PPB_Var_Deprecated_Proxy::GetInfo());
AddPPB(PPB_FileRef_Proxy::GetPrivateInfo());
// PPP (plugin) interfaces.
// Do not add more stuff here, they should be added to interface_list*.h
// TODO(brettw) remove these.
AddPPP(PPP_Graphics3D_Proxy::GetInfo());
AddPPP(PPP_InputEvent_Proxy::GetInfo());
AddPPP(PPP_Instance_Private_Proxy::GetInfo());
......
......@@ -196,18 +196,6 @@ PPB_FileRef_Proxy::PPB_FileRef_Proxy(Dispatcher* dispatcher)
PPB_FileRef_Proxy::~PPB_FileRef_Proxy() {
}
// static
const InterfaceProxy::Info* PPB_FileRef_Proxy::GetPrivateInfo() {
static const Info info = {
thunk::GetPPB_FileRefPrivate_Thunk(),
PPB_FILEREFPRIVATE_INTERFACE,
API_ID_NONE, // URL_LOADER is the canonical one.
false,
&CreateFileRefProxy
};
return &info;
}
// static
PP_Resource PPB_FileRef_Proxy::CreateProxyResource(PP_Resource file_system,
const char* path) {
......
......@@ -29,8 +29,6 @@ class PPB_FileRef_Proxy : public InterfaceProxy {
explicit PPB_FileRef_Proxy(Dispatcher* dispatcher);
virtual ~PPB_FileRef_Proxy();
static const Info* GetPrivateInfo();
static PP_Resource CreateProxyResource(PP_Resource file_system,
const char* path);
......
......@@ -12,6 +12,7 @@ PROXIED_API(PPB_TCPSocket_Private)
PROXIED_API(PPB_UDPSocket_Private)
PROXIED_IFACE(PPB_Broker, PPB_BROKER_TRUSTED_INTERFACE_0_2, PPB_BrokerTrusted)
PROXIED_IFACE(PPB_FileRef, PPB_FILEREFPRIVATE_INTERFACE_0_1, PPB_FileRefPrivate)
PROXIED_IFACE(PPB_Instance, PPB_FLASHFULLSCREEN_INTERFACE, PPB_FlashFullscreen)
PROXIED_IFACE(NoAPIName, PPB_NETADDRESS_PRIVATE_INTERFACE,
PPB_NetAddress_Private)
......
......@@ -33,7 +33,6 @@ struct PPB_BrokerTrusted;
struct PPB_BufferTrusted;
struct PPB_FileChooserTrusted;
struct PPB_FileIOTrusted;
struct PPB_FileRefPrivate;
struct PPB_Flash_Clipboard;
struct PPB_Flash_Menu;
struct PPB_Flash_NetConnector;
......@@ -61,7 +60,6 @@ PPAPI_THUNK_EXPORT const PPB_BufferTrusted* GetPPB_BufferTrusted_Thunk();
PPAPI_THUNK_EXPORT const PPB_FileChooserTrusted*
GetPPB_FileChooser_Trusted_Thunk();
PPAPI_THUNK_EXPORT const PPB_FileIOTrusted* GetPPB_FileIOTrusted_Thunk();
PPAPI_THUNK_EXPORT const PPB_FileRefPrivate* GetPPB_FileRefPrivate_Thunk();
PPAPI_THUNK_EXPORT const PPB_Flash_Clipboard* GetPPB_Flash_Clipboard_Thunk();
PPAPI_THUNK_EXPORT const PPB_Flash_Menu* GetPPB_Flash_Menu_Thunk();
PPAPI_THUNK_EXPORT const PPB_Flash_NetConnector*
......
......@@ -61,6 +61,7 @@
#include "ppapi/c/ppb_var.h"
#include "ppapi/c/ppp.h"
#include "ppapi/c/ppp_instance.h"
#include "ppapi/c/private/ppb_file_ref_private.h"
#include "ppapi/c/private/ppb_flash.h"
#include "ppapi/c/private/ppb_flash_clipboard.h"
#include "ppapi/c/private/ppb_flash_file.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment