summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-11 19:05:40 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-11 19:05:40 +0000
commitdc1e688dc600bd425ad6be0a923c0a6c1d53b6c9 (patch)
tree0309c9a014d4f576faf4a06cdcb0096291746958 /ppapi
parent1de465055c9080db67bad2bd774633f5fa227705 (diff)
downloadchromium_src-dc1e688dc600bd425ad6be0a923c0a6c1d53b6c9.zip
chromium_src-dc1e688dc600bd425ad6be0a923c0a6c1d53b6c9.tar.gz
chromium_src-dc1e688dc600bd425ad6be0a923c0a6c1d53b6c9.tar.bz2
The mime type list can be NULL to allow all files. Handle this case when
converting to a std::string for serialization (the backend treats empty string the same as NULL). Review URL: http://codereview.chromium.org/6824045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81134 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/proxy/ppb_file_chooser_proxy.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/ppapi/proxy/ppb_file_chooser_proxy.cc b/ppapi/proxy/ppb_file_chooser_proxy.cc
index 9c997fb..c89c36a 100644
--- a/ppapi/proxy/ppb_file_chooser_proxy.cc
+++ b/ppapi/proxy/ppb_file_chooser_proxy.cc
@@ -77,7 +77,9 @@ PP_Resource Create(PP_Instance instance,
HostResource result;
dispatcher->Send(new PpapiHostMsg_PPBFileChooser_Create(
INTERFACE_ID_PPB_FILE_CHOOSER, instance,
- options->mode, options->accept_mime_types, &result));
+ options->mode,
+ options->accept_mime_types ? options->accept_mime_types : std::string(),
+ &result));
if (result.is_null())
return 0;