summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/ppb_flash_proxy.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-20 19:11:41 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-20 19:11:41 +0000
commit67ad07979486395ad3ac1647154d5391fd371225 (patch)
tree4409368f4e23bc23cf5ed5875b423ea85b034f42 /ppapi/proxy/ppb_flash_proxy.cc
parent1ef1bc4d63b545e2ea288797de4d23258007d362 (diff)
downloadchromium_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/proxy/ppb_flash_proxy.cc')
-rw-r--r--ppapi/proxy/ppb_flash_proxy.cc6
1 files changed, 4 insertions, 2 deletions
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 = {