Commit 2a7af3d6 authored by bbudge@chromium.org's avatar bbudge@chromium.org

Hook up external monitor detection in PepperFlashDRM.

BUG=375462

Review URL: https://codereview.chromium.org/294393010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273153 0039d316-1c4b-4281-b951-d872f2087c98
parent 2ee53996
...@@ -170,13 +170,17 @@ int32_t PepperFlashDRMHost::OnHostMsgGetHmonitor( ...@@ -170,13 +170,17 @@ int32_t PepperFlashDRMHost::OnHostMsgGetHmonitor(
int32_t PepperFlashDRMHost::OnHostMsgMonitorIsExternal( int32_t PepperFlashDRMHost::OnHostMsgMonitorIsExternal(
ppapi::host::HostMessageContext* context) { ppapi::host::HostMessageContext* context) {
int64_t monitor_id = monitor_finder_->GetMonitor(); int64_t monitor_id = monitor_finder_->GetMonitor();
if (monitor_id) { if (!monitor_id)
// TODO(bbudge) get information about whether monitor is external. return PP_ERROR_FAILED;
context->reply_msg =
PpapiPluginMsg_FlashDRM_MonitorIsExternalReply(PP_FALSE); PP_Bool is_external = PP_FALSE;
return PP_OK; #if defined(OS_MACOSX)
} if (!MonitorFinder::IsMonitorBuiltIn(monitor_id))
return PP_ERROR_FAILED; is_external = PP_TRUE;
#endif
context->reply_msg =
PpapiPluginMsg_FlashDRM_MonitorIsExternalReply(is_external);
return PP_OK;
} }
void PepperFlashDRMHost::GotDeviceID( void PepperFlashDRMHost::GotDeviceID(
......
...@@ -32,6 +32,8 @@ PROXIED_IFACE(PPB_FLASH_DEVICEID_INTERFACE_1_0, ...@@ -32,6 +32,8 @@ PROXIED_IFACE(PPB_FLASH_DEVICEID_INTERFACE_1_0,
PPB_Flash_DeviceID_1_0) PPB_Flash_DeviceID_1_0)
PROXIED_IFACE(PPB_FLASH_DRM_INTERFACE_1_0, PROXIED_IFACE(PPB_FLASH_DRM_INTERFACE_1_0,
PPB_Flash_DRM_1_0) PPB_Flash_DRM_1_0)
PROXIED_IFACE(PPB_FLASH_DRM_INTERFACE_1_1,
PPB_Flash_DRM_1_1)
PROXIED_IFACE(PPB_FLASH_FONTFILE_INTERFACE_0_1, PROXIED_IFACE(PPB_FLASH_FONTFILE_INTERFACE_0_1,
PPB_Flash_FontFile_0_1) PPB_Flash_FontFile_0_1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment