Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(294)

Unified Diff: webkit/plugins/ppapi/ppb_file_chooser_impl.cc

Issue 6286128: Pepper: Make PPB_FileChooser_Dev::Show "return" PP_ERROR_USERCANCEL if no file is selected. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/c/dev/ppb_file_chooser_dev.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/ppapi/ppb_file_chooser_impl.cc
diff --git a/webkit/plugins/ppapi/ppb_file_chooser_impl.cc b/webkit/plugins/ppapi/ppb_file_chooser_impl.cc
index 370fd44b92d33b1a73b10d8495b689f9d6d88ce2..702f1071653c4be5f28cc298f96e709a4dea91b4 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(
« no previous file with comments | « ppapi/c/dev/ppb_file_chooser_dev.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698