diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 01:56:39 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 01:56:39 +0000 |
| commit | 1fd1909fd94c1a6a2b89a3b54eecef3c823b66c0 (patch) | |
| tree | f4b133896478b01dab028f73d219bbeddbc7e92c /ppapi | |
| parent | 8dba9ea803de32e8abf3845a82fd41c33f5386f5 (diff) | |
| download | chromium_src-1fd1909fd94c1a6a2b89a3b54eecef3c823b66c0.zip chromium_src-1fd1909fd94c1a6a2b89a3b54eecef3c823b66c0.tar.gz chromium_src-1fd1909fd94c1a6a2b89a3b54eecef3c823b66c0.tar.bz2 | |
PPB_FLASH_DEVICEID_INTERFACE_1_0 requires PERMISSION_FLASH.
This CL reverts r215423 and r230644.
TBR=isherman@chromium.org,teravest@chromium.org
Review URL: https://codereview.chromium.org/193753002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256393 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/thunk/interfaces_ppb_private.h | 3 | ||||
| -rw-r--r-- | ppapi/thunk/interfaces_ppb_private_flash.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ppapi/thunk/interfaces_ppb_private.h b/ppapi/thunk/interfaces_ppb_private.h index 1d2d143..76c23c0 100644 --- a/ppapi/thunk/interfaces_ppb_private.h +++ b/ppapi/thunk/interfaces_ppb_private.h @@ -33,9 +33,6 @@ PROXIED_IFACE(PPB_FILECHOOSER_TRUSTED_INTERFACE_0_6, PPB_FileChooserTrusted_0_6) PROXIED_IFACE(PPB_FILEREFPRIVATE_INTERFACE_0_1, PPB_FileRefPrivate_0_1) -// TODO(xhwang): Move PPB_Flash_DeviceID back to interfaces_ppb_private_flash.h. -PROXIED_IFACE(PPB_FLASH_DEVICEID_INTERFACE_1_0, - PPB_Flash_DeviceID_1_0) PROXIED_IFACE(PPB_FLASHFULLSCREEN_INTERFACE_0_1, PPB_FlashFullscreen_0_1) PROXIED_IFACE(PPB_FLASHFULLSCREEN_INTERFACE_1_0, diff --git a/ppapi/thunk/interfaces_ppb_private_flash.h b/ppapi/thunk/interfaces_ppb_private_flash.h index a3915c2..ab45daf 100644 --- a/ppapi/thunk/interfaces_ppb_private_flash.h +++ b/ppapi/thunk/interfaces_ppb_private_flash.h @@ -28,6 +28,8 @@ PROXIED_IFACE(PPB_FLASH_CLIPBOARD_INTERFACE_5_0, PROXIED_IFACE(PPB_FLASH_CLIPBOARD_INTERFACE_5_1, PPB_Flash_Clipboard_5_1) +PROXIED_IFACE(PPB_FLASH_DEVICEID_INTERFACE_1_0, + PPB_Flash_DeviceID_1_0) PROXIED_IFACE(PPB_FLASH_DRM_INTERFACE_1_0, PPB_Flash_DRM_1_0) |