diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 00:13:17 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 00:13:17 +0000 |
| commit | 0c56006b65298dc08010fc00edf8ebffe651b7e7 (patch) | |
| tree | fe664195892e3c9f297e746a20d80c54501fdea9 /chrome/browser/renderer_host | |
| parent | 9f45186915e269fa32c1f7dd44873bb535854dbd (diff) | |
| download | chromium_src-0c56006b65298dc08010fc00edf8ebffe651b7e7.zip chromium_src-0c56006b65298dc08010fc00edf8ebffe651b7e7.tar.gz chromium_src-0c56006b65298dc08010fc00edf8ebffe651b7e7.tar.bz2 | |
Give a default HMONITOR for Pepper's OnHostMsgGetHmonitor
So we can do an end-to-end testing of the functionality with Flash.
BUG=249135
TEST=included
Review URL: https://chromiumcodereview.appspot.com/16873002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
| -rw-r--r-- | chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc b/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc index 4b85639..8440b56 100644 --- a/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc +++ b/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc @@ -4,6 +4,10 @@ #include "chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h" +#if defined(OS_WIN) +#include <Windows.h> +#endif + #include "base/bind.h" #include "base/compiler_specific.h" #include "base/logging.h" @@ -72,9 +76,16 @@ int32_t PepperFlashDRMHost::OnHostMsgGetDeviceID( int32_t PepperFlashDRMHost::OnHostMsgGetHmonitor( ppapi::host::HostMessageContext* context) { - // TODO(cpu): Get the HMONITOR. - context->reply_msg = PpapiPluginMsg_FlashDRM_GetHmonitorReply(0); +#if defined(OS_WIN) + // TODO(cpu): Get the real HMONITOR. See bug 249135. + POINT pt = {1,1}; + HMONITOR monitor = ::MonitorFromPoint(pt, MONITOR_DEFAULTTOPRIMARY); + int64_t monitor_id = reinterpret_cast<int64_t>(monitor); + context->reply_msg = PpapiPluginMsg_FlashDRM_GetHmonitorReply(monitor_id); return PP_OK; +#else + return PP_ERROR_FAILED; +#endif } void PepperFlashDRMHost::GotDeviceID( |