| Index: chrome/renderer/render_view.cc
|
| ===================================================================
|
| --- chrome/renderer/render_view.cc (revision 36330)
|
| +++ chrome/renderer/render_view.cc (working copy)
|
| @@ -76,6 +76,7 @@
|
| #include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgent.h"
|
| #include "third_party/WebKit/WebKit/chromium/public/WebDocument.h"
|
| #include "third_party/WebKit/WebKit/chromium/public/WebDragData.h"
|
| +#include "third_party/WebKit/WebKit/chromium/public/WebFileChooserParams.h"
|
| #include "third_party/WebKit/WebKit/chromium/public/WebFormElement.h"
|
| #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
|
| #include "third_party/WebKit/WebKit/chromium/public/WebHistoryItem.h"
|
| @@ -1589,9 +1590,7 @@
|
| }
|
|
|
| bool RenderView::runFileChooser(
|
| - bool multi_select,
|
| - const WebKit::WebString& title,
|
| - const WebKit::WebString& initial_value,
|
| + const WebKit::WebFileChooserParams& params,
|
| WebKit::WebFileChooserCompletion* chooser_completion) {
|
| if (file_chooser_completion_) {
|
| // TODO(brettw): bug 1235154: This should be a synchronous message to deal
|
| @@ -1604,8 +1603,8 @@
|
| }
|
| file_chooser_completion_ = chooser_completion;
|
| Send(new ViewHostMsg_RunFileChooser(
|
| - routing_id_, multi_select, title,
|
| - webkit_glue::WebStringToFilePath(initial_value)));
|
| + routing_id_, params.multiSelect, params.title,
|
| + webkit_glue::WebStringToFilePath(params.initialValue)));
|
| return true;
|
| }
|
|
|
|
|