diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-26 22:21:59 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-26 22:21:59 +0000 |
| commit | 11f515acdda3473200ff0cc4106a0020a7d4dc74 (patch) | |
| tree | cdfd9713928d6f0fa73b5cd7bedbd965fc93e329 /ppapi/c/trusted | |
| parent | f60d96e82acd547ac834b93cd68865b66ab5b4da (diff) | |
| download | chromium_src-11f515acdda3473200ff0cc4106a0020a7d4dc74.zip chromium_src-11f515acdda3473200ff0cc4106a0020a7d4dc74.tar.gz chromium_src-11f515acdda3473200ff0cc4106a0020a7d4dc74.tar.bz2 | |
New file chooser interface that uses the new PP_ArrayOutput feature. This also changes PP_ArrayOutput to be pass-by-value.
This keeps backwards compat for the old interface. It fixes some bugs in the callback system that I found when working on the patch and adds some new machinery for doing array output in the proxy. It also re-enables the file chooser feature which was recently broken.
BUG=118857
Review URL: https://chromiumcodereview.appspot.com/9728001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129022 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/c/trusted')
| -rw-r--r-- | ppapi/c/trusted/ppb_file_chooser_trusted.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/ppapi/c/trusted/ppb_file_chooser_trusted.h b/ppapi/c/trusted/ppb_file_chooser_trusted.h index 85187a7..048639a 100644 --- a/ppapi/c/trusted/ppb_file_chooser_trusted.h +++ b/ppapi/c/trusted/ppb_file_chooser_trusted.h @@ -4,12 +4,13 @@ */ /* From trusted/ppb_file_chooser_trusted.idl, - * modified Wed Jan 4 11:09:00 2012. + * modified Fri Mar 16 10:00:48 2012. */ #ifndef PPAPI_C_TRUSTED_PPB_FILE_CHOOSER_TRUSTED_H_ #define PPAPI_C_TRUSTED_PPB_FILE_CHOOSER_TRUSTED_H_ +#include "ppapi/c/pp_array_output.h" #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_macros.h" @@ -18,7 +19,8 @@ #include "ppapi/c/pp_var.h" #define PPB_FILECHOOSER_TRUSTED_INTERFACE_0_5 "PPB_FileChooserTrusted;0.5" -#define PPB_FILECHOOSER_TRUSTED_INTERFACE PPB_FILECHOOSER_TRUSTED_INTERFACE_0_5 +#define PPB_FILECHOOSER_TRUSTED_INTERFACE_0_6 "PPB_FileChooserTrusted;0.6" +#define PPB_FILECHOOSER_TRUSTED_INTERFACE PPB_FILECHOOSER_TRUSTED_INTERFACE_0_6 /** * @file @@ -30,7 +32,7 @@ * @addtogroup Interfaces * @{ */ -struct PPB_FileChooserTrusted_0_5 { +struct PPB_FileChooserTrusted_0_6 { /** * This function displays a previously created file chooser resource as a * dialog box, prompting the user to choose a file or files to open, or a @@ -52,10 +54,18 @@ struct PPB_FileChooserTrusted_0_5 { int32_t (*ShowWithoutUserGesture)(PP_Resource chooser, PP_Bool save_as, struct PP_Var suggested_file_name, + struct PP_ArrayOutput output, struct PP_CompletionCallback callback); }; -typedef struct PPB_FileChooserTrusted_0_5 PPB_FileChooserTrusted; +typedef struct PPB_FileChooserTrusted_0_6 PPB_FileChooserTrusted; + +struct PPB_FileChooserTrusted_0_5 { + int32_t (*ShowWithoutUserGesture)(PP_Resource chooser, + PP_Bool save_as, + struct PP_Var suggested_file_name, + struct PP_CompletionCallback callback); +}; /** * @} */ |