diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-15 05:08:38 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-15 05:08:38 +0000 |
| commit | b7631cc577c480fa04d0e7f1d4d1b9ffc60b2cdc (patch) | |
| tree | 7653d8ec53c9f154be07bc7240ad54d0f0f682e6 /ppapi/thunk | |
| parent | a78f03cf0fb7e2053099bcc4b73d558c9d653ed1 (diff) | |
| download | chromium_src-b7631cc577c480fa04d0e7f1d4d1b9ffc60b2cdc.zip chromium_src-b7631cc577c480fa04d0e7f1d4d1b9ffc60b2cdc.tar.gz chromium_src-b7631cc577c480fa04d0e7f1d4d1b9ffc60b2cdc.tar.bz2 | |
Convert the async device ID getter to a chrome resource host
Review URL: https://codereview.chromium.org/10909138
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156989 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/thunk')
| -rw-r--r-- | ppapi/thunk/interfaces_ppb_private_flash.h | 3 | ||||
| -rw-r--r-- | ppapi/thunk/ppb_flash_device_id_api.h | 8 | ||||
| -rw-r--r-- | ppapi/thunk/ppb_flash_device_id_thunk.cc | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/ppapi/thunk/interfaces_ppb_private_flash.h b/ppapi/thunk/interfaces_ppb_private_flash.h index 7226020..8ec049a 100644 --- a/ppapi/thunk/interfaces_ppb_private_flash.h +++ b/ppapi/thunk/interfaces_ppb_private_flash.h @@ -46,8 +46,7 @@ PROXIED_IFACE(PPB_Flash, PPB_FLASH_FILE_FILEREF_INTERFACE, PPB_Flash_File_FileRef) -PROXIED_API(PPB_Flash_DeviceID) -PROXIED_IFACE(PPB_Flash_DeviceID, +PROXIED_IFACE(NoAPIName, PPB_FLASH_DEVICEID_INTERFACE_1_0, PPB_Flash_DeviceID_1_0) diff --git a/ppapi/thunk/ppb_flash_device_id_api.h b/ppapi/thunk/ppb_flash_device_id_api.h index ae31abd..cbd1bf5 100644 --- a/ppapi/thunk/ppb_flash_device_id_api.h +++ b/ppapi/thunk/ppb_flash_device_id_api.h @@ -2,7 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/memory/ref_counted.h" +#include "ppapi/thunk/ppapi_thunk_export.h" + namespace ppapi { + +class TrackedCallback; + namespace thunk { class PPAPI_THUNK_EXPORT PPB_Flash_DeviceID_API { @@ -10,7 +16,7 @@ class PPAPI_THUNK_EXPORT PPB_Flash_DeviceID_API { virtual ~PPB_Flash_DeviceID_API() {} virtual int32_t GetDeviceID(PP_Var* id, - const PP_CompletionCallback& callback) = 0; + scoped_refptr<TrackedCallback> callback) = 0; }; } // namespace thunk diff --git a/ppapi/thunk/ppb_flash_device_id_thunk.cc b/ppapi/thunk/ppb_flash_device_id_thunk.cc index 9275648..498df75 100644 --- a/ppapi/thunk/ppb_flash_device_id_thunk.cc +++ b/ppapi/thunk/ppb_flash_device_id_thunk.cc @@ -26,7 +26,7 @@ int32_t GetDeviceID(PP_Resource resource, EnterResource<PPB_Flash_DeviceID_API> enter(resource, callback, true); if (enter.failed()) return enter.retval(); - return enter.SetResult(enter.object()->GetDeviceID(id, callback)); + return enter.SetResult(enter.object()->GetDeviceID(id, enter.callback())); } const PPB_Flash_DeviceID g_ppb_flash_deviceid_thunk = { |