diff options
| author | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-10 17:56:39 +0000 |
|---|---|---|
| committer | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-10 17:56:39 +0000 |
| commit | 9b451c0bce7c09d32a1f885f2b86fc388ecd8ee7 (patch) | |
| tree | 258cddf035cb585b515ee8d69bc58b3e4e9d8620 /webkit/glue/chrome_client_impl.cc | |
| parent | 81f3095725e27bc914f5ce85d99a929f76a347d3 (diff) | |
| download | chromium_src-9b451c0bce7c09d32a1f885f2b86fc388ecd8ee7.zip chromium_src-9b451c0bce7c09d32a1f885f2b86fc388ecd8ee7.tar.gz chromium_src-9b451c0bce7c09d32a1f885f2b86fc388ecd8ee7.tar.bz2 | |
Landing 37604:38097 merge
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5110 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/chrome_client_impl.cc')
| -rw-r--r-- | webkit/glue/chrome_client_impl.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/webkit/glue/chrome_client_impl.cc b/webkit/glue/chrome_client_impl.cc index 081d4c7..4142548 100644 --- a/webkit/glue/chrome_client_impl.cc +++ b/webkit/glue/chrome_client_impl.cc @@ -438,13 +438,15 @@ void ChromeClientImpl::exceededDatabaseQuota(WebCore::Frame* frame, // TODO(tc): If we enable the storage API, we need to implement this function. } -void ChromeClientImpl::runFileChooser(const WebCore::String& default_path, - PassRefPtr<WebCore::FileChooser> fileChooser) { +void ChromeClientImpl::runOpenPanel(WebCore::Frame* frame, + PassRefPtr<WebCore::FileChooser> fileChooser) { WebViewDelegate* delegate = webview_->delegate(); if (!delegate) return; - std::wstring suggestion = webkit_glue::StringToStdWString(default_path); + std::wstring suggestion = webkit_glue::StringToStdWString( + fileChooser->filenames()[0]); + WebFileChooserCallbackImpl* chooser = new WebFileChooserCallbackImpl(fileChooser); delegate->RunFileChooser(suggestion, chooser); } |