summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-07 17:32:43 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-07 17:32:43 +0000
commit470ae161eeeff7059903902451f52888f7a43b98 (patch)
tree8128404b72cabf32531e6c55255fbaaf2deb184f /webkit
parentad67f979e1b4c0a8e61065681a4b6594d6570067 (diff)
downloadchromium_src-470ae161eeeff7059903902451f52888f7a43b98.zip
chromium_src-470ae161eeeff7059903902451f52888f7a43b98.tar.gz
chromium_src-470ae161eeeff7059903902451f52888f7a43b98.tar.bz2
Pepper: Make PPB_FileChooser_Dev::Show "return" PP_ERROR_USERCANCEL if no file is selected.
BUG=none TEST=none Review URL: http://codereview.chromium.org/6286128 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73995 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/plugins/ppapi/ppb_file_chooser_impl.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/plugins/ppapi/ppb_file_chooser_impl.cc b/webkit/plugins/ppapi/ppb_file_chooser_impl.cc
index 370fd44b..702f107 100644
--- a/webkit/plugins/ppapi/ppb_file_chooser_impl.cc
+++ b/webkit/plugins/ppapi/ppb_file_chooser_impl.cc
@@ -144,7 +144,7 @@ void PPB_FileChooser_Impl::StoreChosenFiles(
new PPB_FileRef_Impl(instance(), file_path)));
}
- RunCallback(PP_OK);
+ RunCallback((chosen_files_.size() > 0) ? PP_OK : PP_ERROR_USERCANCEL);
}
int32_t PPB_FileChooser_Impl::ValidateCallback(