diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-15 00:35:40 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-15 00:35:40 +0000 |
| commit | ef362466544a6b3007f8ac44cee16a3e1a720dd9 (patch) | |
| tree | 7cb5e76c22a284e5d2c2b95ee9aa1ae0ed187214 /ppapi/proxy/interface_list.cc | |
| parent | 320eff44dc909bf0fe575b3bff1df08a2fd99736 (diff) | |
| download | chromium_src-ef362466544a6b3007f8ac44cee16a3e1a720dd9.zip chromium_src-ef362466544a6b3007f8ac44cee16a3e1a720dd9.tar.gz chromium_src-ef362466544a6b3007f8ac44cee16a3e1a720dd9.tar.bz2 | |
Pepper: Generate ppb_flash_clipboard.h from .idl file.
Also, convert the version number for the PPB_Flash_Clipboard interface to the
standard form.
BUG=104001,104184
TEST=(The existing) Pepper Flash still works.
TBR=dmichael@chromium.org
Review URL: http://codereview.chromium.org/8559003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109999 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/interface_list.cc')
| -rw-r--r-- | ppapi/proxy/interface_list.cc | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc index c1f1b9f..f855f90 100644 --- a/ppapi/proxy/interface_list.cc +++ b/ppapi/proxy/interface_list.cc @@ -238,10 +238,21 @@ const void* InterfaceList::GetInterfaceForPPP(const std::string& name) const { } void InterfaceList::AddFlashInterfaces() { + AddProxy(API_ID_PPB_FLASH, &ProxyFactory<PPB_Flash_Proxy>); + AddPPB(PPB_FLASH_INTERFACE, API_ID_PPB_FLASH, + PPB_Flash_Proxy::GetInterface()); + AddProxy(API_ID_PPB_FLASH_CLIPBOARD, &ProxyFactory<PPB_Flash_Clipboard_Proxy>); AddPPB(PPB_FLASH_CLIPBOARD_INTERFACE, API_ID_PPB_FLASH_CLIPBOARD, thunk::GetPPB_Flash_Clipboard_Thunk()); + AddPPB(PPB_FLASH_CLIPBOARD_INTERFACE_3_LEGACY, API_ID_PPB_FLASH_CLIPBOARD, + thunk::GetPPB_Flash_Clipboard_Thunk()); + + AddProxy(API_ID_PPB_FLASH_FILE_FILEREF, + &ProxyFactory<PPB_Flash_File_FileRef_Proxy>); + AddPPB(PPB_FLASH_FILE_FILEREF_INTERFACE, API_ID_PPB_FLASH_FILE_FILEREF, + PPB_Flash_File_FileRef_Proxy::GetInterface()); AddProxy(API_ID_PPB_FLASH_FILE_MODULELOCAL, &ProxyFactory<PPB_Flash_File_ModuleLocal_Proxy>); @@ -249,19 +260,10 @@ void InterfaceList::AddFlashInterfaces() { API_ID_PPB_FLASH_FILE_MODULELOCAL, PPB_Flash_File_ModuleLocal_Proxy::GetInterface()); - AddProxy(API_ID_PPB_FLASH_FILE_FILEREF, - &ProxyFactory<PPB_Flash_File_FileRef_Proxy>); - AddPPB(PPB_FLASH_FILE_FILEREF_INTERFACE, API_ID_PPB_FLASH_FILE_FILEREF, - PPB_Flash_File_FileRef_Proxy::GetInterface()); - AddProxy(API_ID_PPB_FLASH_MENU, &ProxyFactory<PPB_Flash_Menu_Proxy>); AddPPB(PPB_FLASH_MENU_INTERFACE, API_ID_PPB_FLASH_MENU, thunk::GetPPB_Flash_Menu_Thunk()); - AddProxy(API_ID_PPB_FLASH, &ProxyFactory<PPB_Flash_Proxy>); - AddPPB(PPB_FLASH_INTERFACE, API_ID_PPB_FLASH, - PPB_Flash_Proxy::GetInterface()); - AddProxy(API_ID_PPB_FLASH_TCPSOCKET, &ProxyFactory<PPB_Flash_TCPSocket_Proxy>); AddPPB(PPB_FLASH_TCPSOCKET_INTERFACE, API_ID_PPB_FLASH_TCPSOCKET, |