Hook up the file chooser proxy 0.6

This also removes the "old" style registration for the 0.5 version.

BUG=122440
TEST=


Review URL: http://codereview.chromium.org/10008064

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131384 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 15 deletions

diff --git a/ppapi/thunk/interfaces_ppb_private.h b/ppapi/thunk/interfaces_ppb_private.h
index 39259aa..85a0842 100644
--- a/ppapi/thunk/interfaces_ppb_private.h
+++ b/ppapi/thunk/interfaces_ppb_private.h
@@ -23,6 +23,10 @@ PROXIED_IFACE(PPB_Instance, PPB_BROWSERFONT_TRUSTED_INTERFACE_1_0,
               PPB_BrowserFont_Trusted_1_0)
 PROXIED_IFACE(PPB_Instance, PPB_CHARSET_TRUSTED_INTERFACE_1_0,
               PPB_CharSet_Trusted_1_0)
+PROXIED_IFACE(PPB_FileChooser, PPB_FILECHOOSER_TRUSTED_INTERFACE_0_5,
+              PPB_FileChooserTrusted_0_5)
+PROXIED_IFACE(PPB_FileChooser, PPB_FILECHOOSER_TRUSTED_INTERFACE_0_6,
+              PPB_FileChooserTrusted_0_6)
 PROXIED_IFACE(PPB_FileRef, PPB_FILEREFPRIVATE_INTERFACE_0_1,
               PPB_FileRefPrivate_0_1)
 // This uses the FileIO API which is declared in the public stable file.
diff --git a/ppapi/thunk/ppb_file_chooser_thunk.cc b/ppapi/thunk/ppb_file_chooser_thunk.cc
index 4e590c7..083ffb8 100644
--- a/ppapi/thunk/ppb_file_chooser_thunk.cc
+++ b/ppapi/thunk/ppb_file_chooser_thunk.cc
@@ -57,19 +57,6 @@ int32_t Show(PP_Resource chooser,
   return enter.SetResult(enter.object()->Show(output, callback));
 }
 
-
-int32_t ShowWithoutUserGesture(PP_Resource chooser,
-                               PP_Bool save_as,
-                               PP_Var suggested_file_name,
-                               const PP_ArrayOutput* output,
-                               PP_CompletionCallback callback) {
-  EnterResource<PPB_FileChooser_API> enter(chooser, callback, true);
-  if (enter.failed())
-    return enter.retval();
-  return enter.SetResult(enter.object()->ShowWithoutUserGesture(
-      save_as, suggested_file_name, *output, callback));
-}
-
 int32_t ShowWithoutUserGesture0_5(PP_Resource chooser,
                                   PP_Bool save_as,
                                   PP_Var suggested_file_name,
@@ -124,11 +111,11 @@ const PPB_FileChooser_Dev_0_6* GetPPB_FileChooser_Dev_0_6_Thunk() {
   return &g_ppb_file_chooser_0_6_thunk;
 }
 
-const PPB_FileChooserTrusted_0_5* GetPPB_FileChooser_Trusted_0_5_Thunk() {
+const PPB_FileChooserTrusted_0_5* GetPPB_FileChooserTrusted_0_5_Thunk() {
   return &g_ppb_file_chooser_trusted_0_5_thunk;
 }
 
-const PPB_FileChooserTrusted_0_6* GetPPB_FileChooser_Trusted_0_6_Thunk() {
+const PPB_FileChooserTrusted_0_6* GetPPB_FileChooserTrusted_0_6_Thunk() {
   return &g_ppb_file_chooser_trusted_0_6_thunk;
 }