diff options
| -rw-r--r-- | ppapi/api/private/ppb_flash_clipboard.idl | 4 | ||||
| -rw-r--r-- | ppapi/c/private/ppb_flash_clipboard.h | 6 | ||||
| -rw-r--r-- | ppapi/proxy/ppb_flash_clipboard_proxy.cc | 3 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/ppb_flash_clipboard_impl.cc | 2 |
4 files changed, 4 insertions, 11 deletions
diff --git a/ppapi/api/private/ppb_flash_clipboard.idl b/ppapi/api/private/ppb_flash_clipboard.idl index a84020b..e0f0b0d 100644 --- a/ppapi/api/private/ppb_flash_clipboard.idl +++ b/ppapi/api/private/ppb_flash_clipboard.idl @@ -29,9 +29,7 @@ enum PP_Flash_Clipboard_Type { /** The standard clipboard. */ PP_FLASH_CLIPBOARD_TYPE_STANDARD = 0, /** The selection clipboard (e.g., on Linux). */ - PP_FLASH_CLIPBOARD_TYPE_SELECTION = 1, - /** The drag clipboard. */ - PP_FLASH_CLIPBOARD_TYPE_DRAG = 2 + PP_FLASH_CLIPBOARD_TYPE_SELECTION = 1 }; /** diff --git a/ppapi/c/private/ppb_flash_clipboard.h b/ppapi/c/private/ppb_flash_clipboard.h index fa897b5..c328525 100644 --- a/ppapi/c/private/ppb_flash_clipboard.h +++ b/ppapi/c/private/ppb_flash_clipboard.h @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -/* From private/ppb_flash_clipboard.idl modified Mon Nov 14 13:36:44 2011. */ +/* From private/ppb_flash_clipboard.idl modified Wed Nov 23 12:39:42 2011. */ #ifndef PPAPI_C_PRIVATE_PPB_FLASH_CLIPBOARD_H_ #define PPAPI_C_PRIVATE_PPB_FLASH_CLIPBOARD_H_ @@ -42,9 +42,7 @@ typedef enum { /** The standard clipboard. */ PP_FLASH_CLIPBOARD_TYPE_STANDARD = 0, /** The selection clipboard (e.g., on Linux). */ - PP_FLASH_CLIPBOARD_TYPE_SELECTION = 1, - /** The drag clipboard. */ - PP_FLASH_CLIPBOARD_TYPE_DRAG = 2 + PP_FLASH_CLIPBOARD_TYPE_SELECTION = 1 } PP_Flash_Clipboard_Type; PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_Flash_Clipboard_Type, 4); diff --git a/ppapi/proxy/ppb_flash_clipboard_proxy.cc b/ppapi/proxy/ppb_flash_clipboard_proxy.cc index 33f371d..df6cc59 100644 --- a/ppapi/proxy/ppb_flash_clipboard_proxy.cc +++ b/ppapi/proxy/ppb_flash_clipboard_proxy.cc @@ -23,8 +23,7 @@ typedef thunk::EnterFunctionNoLock<PPB_Flash_Clipboard_FunctionAPI> bool IsValidClipboardType(PP_Flash_Clipboard_Type clipboard_type) { return clipboard_type == PP_FLASH_CLIPBOARD_TYPE_STANDARD || - clipboard_type == PP_FLASH_CLIPBOARD_TYPE_SELECTION || - clipboard_type == PP_FLASH_CLIPBOARD_TYPE_DRAG; + clipboard_type == PP_FLASH_CLIPBOARD_TYPE_SELECTION; } bool IsValidClipboardFormat(PP_Flash_Clipboard_Format format) { diff --git a/webkit/plugins/ppapi/ppb_flash_clipboard_impl.cc b/webkit/plugins/ppapi/ppb_flash_clipboard_impl.cc index da3ea24..d39bf42 100644 --- a/webkit/plugins/ppapi/ppb_flash_clipboard_impl.cc +++ b/webkit/plugins/ppapi/ppb_flash_clipboard_impl.cc @@ -38,8 +38,6 @@ WebKit::WebClipboard::Buffer ConvertClipboardType( return WebKit::WebClipboard::BufferStandard; case PP_FLASH_CLIPBOARD_TYPE_SELECTION: return WebKit::WebClipboard::BufferSelection; - case PP_FLASH_CLIPBOARD_TYPE_DRAG: - return WebKit::WebClipboard::BufferDrag; default: NOTREACHED(); return WebKit::WebClipboard::BufferStandard; |