summaryrefslogtreecommitdiffstats
path: root/ppapi/cpp
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-09 18:08:33 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-09 18:08:33 +0000
commitdf26f7a343115eee4173397b964c8e9060f8d4bc (patch)
tree8e539ebb4c03d8bd74055f9b1f01baa552264953 /ppapi/cpp
parent07c234afb79da58678041d152d15c547077ee93a (diff)
downloadchromium_src-df26f7a343115eee4173397b964c8e9060f8d4bc.zip
chromium_src-df26f7a343115eee4173397b964c8e9060f8d4bc.tar.gz
chromium_src-df26f7a343115eee4173397b964c8e9060f8d4bc.tar.bz2
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
Diffstat (limited to 'ppapi/cpp')
-rw-r--r--ppapi/cpp/trusted/file_chooser_trusted.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/ppapi/cpp/trusted/file_chooser_trusted.cc b/ppapi/cpp/trusted/file_chooser_trusted.cc
index d925518..92fec74 100644
--- a/ppapi/cpp/trusted/file_chooser_trusted.cc
+++ b/ppapi/cpp/trusted/file_chooser_trusted.cc
@@ -67,6 +67,7 @@ int32_t FileChooser_Trusted::Show(
ChooseCallbackData0_5* data = new ChooseCallbackData0_5;
data->file_chooser = pp_resource();
data->output = callback.output();
+ data->original_callback = callback.pp_completion_callback();
return get_interface<PPB_FileChooserTrusted_0_5>()->ShowWithoutUserGesture(
pp_resource(),