diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-12 20:03:08 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-12 20:03:08 +0000 |
| commit | b949f1110dea9e220706cbe72ede4118d78308f0 (patch) | |
| tree | 16627db33014921df4287548a54caac852dd76eb /webkit | |
| parent | 3e1302168c2b16d744486172b55dc48114baac7e (diff) | |
| download | chromium_src-b949f1110dea9e220706cbe72ede4118d78308f0.zip chromium_src-b949f1110dea9e220706cbe72ede4118d78308f0.tar.gz chromium_src-b949f1110dea9e220706cbe72ede4118d78308f0.tar.bz2 | |
Refactoring; switch the |filter| parameter into something that is more amenable to cross-platform implementation.
BUG=9852
Review URL: http://codereview.chromium.org/63093
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13573 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/chrome_client_impl.cc | 11 | ||||
| -rw-r--r-- | webkit/glue/webview_delegate.h | 5 |
2 files changed, 8 insertions, 8 deletions
diff --git a/webkit/glue/chrome_client_impl.cc b/webkit/glue/chrome_client_impl.cc index f3addc5..4fc2790 100644 --- a/webkit/glue/chrome_client_impl.cc +++ b/webkit/glue/chrome_client_impl.cc @@ -497,13 +497,14 @@ void ChromeClientImpl::runOpenPanel(WebCore::Frame* frame, bool multiple_files = fileChooser->allowsMultipleFiles(); - std::wstring suggestion; + FilePath suggestion; if (fileChooser->filenames().size() > 0) - suggestion = webkit_glue::StringToStdWString(fileChooser->filenames()[0]); + suggestion = FilePath( + webkit_glue::StringToFilePathString(fileChooser->filenames()[0])); - WebFileChooserCallbackImpl* chooser = new WebFileChooserCallbackImpl(fileChooser); - delegate->RunFileChooser(multiple_files, std::wstring(), suggestion, - std::wstring(), chooser); + WebFileChooserCallbackImpl* chooser = + new WebFileChooserCallbackImpl(fileChooser); + delegate->RunFileChooser(multiple_files, string16(), suggestion, chooser); } void ChromeClientImpl::popupOpened(WebCore::PopupContainer* popup_container, diff --git a/webkit/glue/webview_delegate.h b/webkit/glue/webview_delegate.h index 8b2866a..b37c718 100644 --- a/webkit/glue/webview_delegate.h +++ b/webkit/glue/webview_delegate.h @@ -557,9 +557,8 @@ class WebViewDelegate : virtual public WebWidgetDelegate { // will own the WebFileChooserCallback object and is responsible for // freeing it. 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) { delete file_chooser; } |