OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/pepper/pepper_file_chooser_host.h" | 5 #include "content/renderer/pepper/pepper_file_chooser_host.h" |
6 | 6 |
7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "content/public/renderer/renderer_ppapi_host.h" | 9 #include "content/public/renderer/renderer_ppapi_host.h" |
10 #include "content/renderer/pepper/pepper_file_ref_renderer_host.h" | 10 #include "content/renderer/pepper/pepper_file_ref_renderer_host.h" |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 } | 134 } |
135 | 135 |
136 blink::WebFileChooserParams params; | 136 blink::WebFileChooserParams params; |
137 if (save_as) { | 137 if (save_as) { |
138 params.saveAs = true; | 138 params.saveAs = true; |
139 params.initialValue = blink::WebString::fromUTF8( | 139 params.initialValue = blink::WebString::fromUTF8( |
140 suggested_file_name.data(), suggested_file_name.size()); | 140 suggested_file_name.data(), suggested_file_name.size()); |
141 } else { | 141 } else { |
142 params.multiSelect = open_multiple; | 142 params.multiSelect = open_multiple; |
143 } | 143 } |
144 std::vector<blink::WebString> mine_types(accept_mime_types.size()); | 144 std::vector<blink::WebString> mime_types(accept_mime_types.size()); |
145 for (size_t i = 0; i < accept_mime_types.size(); i++) { | 145 for (size_t i = 0; i < accept_mime_types.size(); i++) { |
146 mine_types[i] = blink::WebString::fromUTF8(accept_mime_types[i].data(), | 146 mime_types[i] = blink::WebString::fromUTF8(accept_mime_types[i].data(), |
147 accept_mime_types[i].size()); | 147 accept_mime_types[i].size()); |
148 } | 148 } |
149 params.acceptTypes = mine_types; | 149 params.acceptTypes = mime_types; |
150 params.directory = false; | 150 params.directory = false; |
| 151 params.needLocalPath = true; |
151 | 152 |
152 handler_ = new CompletionHandler(AsWeakPtr()); | 153 handler_ = new CompletionHandler(AsWeakPtr()); |
153 RenderViewImpl* render_view = static_cast<RenderViewImpl*>( | 154 RenderViewImpl* render_view = static_cast<RenderViewImpl*>( |
154 renderer_ppapi_host_->GetRenderViewForInstance(pp_instance())); | 155 renderer_ppapi_host_->GetRenderViewForInstance(pp_instance())); |
155 if (!render_view || !render_view->runFileChooser(params, handler_)) { | 156 if (!render_view || !render_view->runFileChooser(params, handler_)) { |
156 delete handler_; | 157 delete handler_; |
157 handler_ = NULL; | 158 handler_ = NULL; |
158 return PP_ERROR_NOACCESS; | 159 return PP_ERROR_NOACCESS; |
159 } | 160 } |
160 | 161 |
(...skipping 21 matching lines...) Expand all Loading... |
182 } | 183 } |
183 | 184 |
184 reply_context_.params.set_result(PP_OK); | 185 reply_context_.params.set_result(PP_OK); |
185 host()->SendReply(reply_context_, | 186 host()->SendReply(reply_context_, |
186 PpapiPluginMsg_FileChooser_ShowReply(chosen_files)); | 187 PpapiPluginMsg_FileChooser_ShowReply(chosen_files)); |
187 reply_context_ = ppapi::host::ReplyMessageContext(); | 188 reply_context_ = ppapi::host::ReplyMessageContext(); |
188 handler_ = NULL; // Handler deletes itself. | 189 handler_ = NULL; // Handler deletes itself. |
189 } | 190 } |
190 | 191 |
191 } // namespace content | 192 } // namespace content |
OLD | NEW |