OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/renderer/render_view.h" | 5 #include "chrome/renderer/render_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 1989 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2000 ViewHostMsg_RunFileChooser_Params ipc_params; | 2000 ViewHostMsg_RunFileChooser_Params ipc_params; |
2001 if (params.directory) | 2001 if (params.directory) |
2002 ipc_params.mode = ViewHostMsg_RunFileChooser_Params::OpenFolder; | 2002 ipc_params.mode = ViewHostMsg_RunFileChooser_Params::OpenFolder; |
2003 else if (params.multiSelect) | 2003 else if (params.multiSelect) |
2004 ipc_params.mode = ViewHostMsg_RunFileChooser_Params::OpenMultiple; | 2004 ipc_params.mode = ViewHostMsg_RunFileChooser_Params::OpenMultiple; |
2005 else | 2005 else |
2006 ipc_params.mode = ViewHostMsg_RunFileChooser_Params::Open; | 2006 ipc_params.mode = ViewHostMsg_RunFileChooser_Params::Open; |
2007 ipc_params.title = params.title; | 2007 ipc_params.title = params.title; |
2008 ipc_params.default_file_name = | 2008 ipc_params.default_file_name = |
2009 webkit_glue::WebStringToFilePath(params.initialValue); | 2009 webkit_glue::WebStringToFilePath(params.initialValue); |
| 2010 ipc_params.accept_types = params.acceptTypes; |
2010 | 2011 |
2011 return ScheduleFileChooser(ipc_params, chooser_completion); | 2012 return ScheduleFileChooser(ipc_params, chooser_completion); |
2012 } | 2013 } |
2013 | 2014 |
2014 void RenderView::runModalAlertDialog( | 2015 void RenderView::runModalAlertDialog( |
2015 WebFrame* frame, const WebString& message) { | 2016 WebFrame* frame, const WebString& message) { |
2016 RunJavaScriptMessage(MessageBoxFlags::kIsJavascriptAlert, | 2017 RunJavaScriptMessage(MessageBoxFlags::kIsJavascriptAlert, |
2017 UTF16ToWideHack(message), | 2018 UTF16ToWideHack(message), |
2018 std::wstring(), | 2019 std::wstring(), |
2019 frame->url(), | 2020 frame->url(), |
(...skipping 3658 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5678 PendingOpenFileSystem* request = pending_file_system_requests_.Lookup( | 5679 PendingOpenFileSystem* request = pending_file_system_requests_.Lookup( |
5679 request_id); | 5680 request_id); |
5680 DCHECK(request); | 5681 DCHECK(request); |
5681 if (accepted) | 5682 if (accepted) |
5682 request->callbacks->didOpenFileSystem(name, root_path); | 5683 request->callbacks->didOpenFileSystem(name, root_path); |
5683 else | 5684 else |
5684 request->callbacks->didFail(WebKit::WebFileErrorSecurity); | 5685 request->callbacks->didFail(WebKit::WebFileErrorSecurity); |
5685 request->callbacks = NULL; | 5686 request->callbacks = NULL; |
5686 pending_file_system_requests_.Remove(request_id); | 5687 pending_file_system_requests_.Remove(request_id); |
5687 } | 5688 } |
OLD | NEW |