summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/render_view.cc7
-rw-r--r--chrome/renderer/render_view.h5
2 files changed, 5 insertions, 7 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 5afb9a6..3dd7887 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -1781,9 +1781,8 @@ void RenderView::UpdateTargetURL(WebView* webview, const GURL& url) {
}
void RenderView::RunFileChooser(bool multi_select,
- const std::wstring& title,
- const std::wstring& default_filename,
- const std::wstring& filter,
+ const string16& title,
+ const FilePath& default_filename,
WebFileChooserCallback* file_chooser) {
if (file_chooser_.get()) {
// TODO(brettw): bug 1235154: This should be a synchronous message to deal
@@ -1797,7 +1796,7 @@ void RenderView::RunFileChooser(bool multi_select,
}
file_chooser_.reset(file_chooser);
Send(new ViewHostMsg_RunFileChooser(routing_id_, multi_select, title,
- default_filename, filter));
+ default_filename));
}
void RenderView::AddMessageToConsole(WebView* webview,
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index 409b6ac..dd9b7c6 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -164,9 +164,8 @@ class RenderView : public RenderWidget,
virtual void UpdateTargetURL(WebView* webview,
const GURL& url);
virtual void RunFileChooser(bool multi_select,
- const std::wstring& title,
- const std::wstring& initial_filename,
- const std::wstring& filter,
+ const string16& title,
+ const FilePath& initial_filename,
WebFileChooserCallback* file_chooser);
virtual void AddMessageToConsole(WebView* webview,
const std::wstring& message,