diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-20 19:11:41 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-20 19:11:41 +0000 |
| commit | 67ad07979486395ad3ac1647154d5391fd371225 (patch) | |
| tree | 4409368f4e23bc23cf5ed5875b423ea85b034f42 /ppapi | |
| parent | 1ef1bc4d63b545e2ea288797de4d23258007d362 (diff) | |
| download | chromium_src-67ad07979486395ad3ac1647154d5391fd371225.zip chromium_src-67ad07979486395ad3ac1647154d5391fd371225.tar.gz chromium_src-67ad07979486395ad3ac1647154d5391fd371225.tar.bz2 | |
Hook up the DeviceID to the browser process.
TEST=none
BUG=none
Review URL: https://chromiumcodereview.appspot.com/10130001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133236 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/proxy/ppapi_messages.h | 2 | ||||
| -rw-r--r-- | ppapi/proxy/ppb_flash_proxy.cc | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h index f83078e..43c1331 100644 --- a/ppapi/proxy/ppapi_messages.h +++ b/ppapi/proxy/ppapi_messages.h @@ -1175,6 +1175,8 @@ IPC_SYNC_MESSAGE_ROUTED2_1(PpapiHostMsg_PPBFlash_IsRectTopmost, PP_Instance /* instance */, PP_Rect /* rect */, PP_Bool /* result */) +IPC_SYNC_MESSAGE_ROUTED0_1(PpapiHostMsg_PPBFlash_GetDeviceID, + std::string /* id */) // PPB_Flash_Clipboard. IPC_SYNC_MESSAGE_ROUTED3_1(PpapiHostMsg_PPBFlashClipboard_IsFormatAvailable, diff --git a/ppapi/proxy/ppb_flash_proxy.cc b/ppapi/proxy/ppb_flash_proxy.cc index 18d1f5a..fc394f3 100644 --- a/ppapi/proxy/ppb_flash_proxy.cc +++ b/ppapi/proxy/ppb_flash_proxy.cc @@ -223,8 +223,10 @@ void UpdateActivity(PP_Instance instance) { } PP_Var GetDeviceID(PP_Instance instance) { - // TODO(brettw) implement me. - return PP_MakeUndefined(); + std::string id; + PluginGlobals::Get()->plugin_proxy_delegate()->SendToBrowser( + new PpapiHostMsg_PPBFlash_GetDeviceID(API_ID_PPB_FLASH, &id)); + return StringVar::StringToPPVar(id); } const PPB_Flash_11 flash_interface_11 = { |