diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-11 20:45:01 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-11 20:45:01 +0000 |
| commit | 502ec4dda4411088ac46b55754a027235e4b9217 (patch) | |
| tree | 97a150aca10c22b5b24060a5194164e636521d40 /webkit/plugins | |
| parent | 84734df4b93aa0e7d01313b17ff190022dcca8bf (diff) | |
| download | chromium_src-502ec4dda4411088ac46b55754a027235e4b9217.zip chromium_src-502ec4dda4411088ac46b55754a027235e4b9217.tar.gz chromium_src-502ec4dda4411088ac46b55754a027235e4b9217.tar.bz2 | |
Add an asynchronous version of the Flash DeviceID API.
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10535062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141486 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins')
| -rw-r--r-- | webkit/plugins/ppapi/plugin_module.cc | 1 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/resource_creation_impl.cc | 4 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/resource_creation_impl.h | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc index 70989bd..9a3b1fe 100644 --- a/webkit/plugins/ppapi/plugin_module.cc +++ b/webkit/plugins/ppapi/plugin_module.cc @@ -69,6 +69,7 @@ #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_device_id.h" #include "ppapi/c/private/ppb_flash_file.h" #include "ppapi/c/private/ppb_flash_fullscreen.h" #include "ppapi/c/private/ppb_flash_message_loop.h" diff --git a/webkit/plugins/ppapi/resource_creation_impl.cc b/webkit/plugins/ppapi/resource_creation_impl.cc index 1d0905b..430bd5e 100644 --- a/webkit/plugins/ppapi/resource_creation_impl.cc +++ b/webkit/plugins/ppapi/resource_creation_impl.cc @@ -138,6 +138,10 @@ PP_Resource ResourceCreationImpl::CreateFileSystem( return PPB_FileSystem_Impl::Create(instance, type); } +PP_Resource ResourceCreationImpl::CreateFlashDeviceID(PP_Instance instance) { + return 0; // Not supported in-process. +} + PP_Resource ResourceCreationImpl::CreateFlashMenu( PP_Instance instance, const PP_Flash_Menu* menu_data) { diff --git a/webkit/plugins/ppapi/resource_creation_impl.h b/webkit/plugins/ppapi/resource_creation_impl.h index 4712c19..e22e9e6 100644 --- a/webkit/plugins/ppapi/resource_creation_impl.h +++ b/webkit/plugins/ppapi/resource_creation_impl.h @@ -50,6 +50,7 @@ class ResourceCreationImpl : public ::ppapi::thunk::ResourceCreationAPI { const char* path) OVERRIDE; virtual PP_Resource CreateFileSystem(PP_Instance instance, PP_FileSystemType type) OVERRIDE; + virtual PP_Resource CreateFlashDeviceID(PP_Instance instance) OVERRIDE; virtual PP_Resource CreateFlashMenu(PP_Instance instance, const PP_Flash_Menu* menu_data) OVERRIDE; virtual PP_Resource CreateFlashMessageLoop(PP_Instance instance) OVERRIDE; |