summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/ppb_flash_menu_proxy.cc
diff options
context:
space:
mode:
authorpolina@google.com <polina@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-11 22:46:44 +0000
committerpolina@google.com <polina@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-11 22:46:44 +0000
commit996bdbda28035f7f68955525625c998290706281 (patch)
treedfc61c5633359f02e40421e0240aeac25753b642 /ppapi/proxy/ppb_flash_menu_proxy.cc
parenta965ca65e8170b3d685b7ca9185929fe3915b7f9 (diff)
downloadchromium_src-996bdbda28035f7f68955525625c998290706281.zip
chromium_src-996bdbda28035f7f68955525625c998290706281.tar.gz
chromium_src-996bdbda28035f7f68955525625c998290706281.tar.bz2
1;2cReplace PP_ERROR_WOULDBLOCK with PP_OK_COMPLETIONPENDING. Improve error code comments. Update all code that uses this error code. Keep the old code for now flagging it as deprecated. Update copyrights.
BUG=none TEST=bots Review URL: http://codereview.chromium.org/6814033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81168 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppb_flash_menu_proxy.cc')
-rw-r--r--ppapi/proxy/ppb_flash_menu_proxy.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ppapi/proxy/ppb_flash_menu_proxy.cc b/ppapi/proxy/ppb_flash_menu_proxy.cc
index 1f37768..505ea5d 100644
--- a/ppapi/proxy/ppb_flash_menu_proxy.cc
+++ b/ppapi/proxy/ppb_flash_menu_proxy.cc
@@ -83,7 +83,7 @@ int32_t Show(PP_Resource menu_id,
dispatcher->Send(new PpapiHostMsg_PPBFlashMenu_Show(
INTERFACE_ID_PPB_FLASH_MENU, object->host_resource(), *location));
- return PP_ERROR_WOULDBLOCK;
+ return PP_OK_COMPLETIONPENDING;
}
const PPB_Flash_Menu flash_menu_interface = {
@@ -159,7 +159,7 @@ void PPB_Flash_Menu_Proxy::OnMsgShow(const HostResource& menu,
&location,
&request->selected_id,
callback.pp_completion_callback());
- if (result != PP_ERROR_WOULDBLOCK) {
+ if (result != PP_OK_COMPLETIONPENDING) {
// There was some error, so we won't get a callback. We need to now issue
// the ACK to the plugin so that it hears about the error. This will also
// clean up the data associated with the callback.