bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-18 13:10:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix display of file chooser dialog. Signature of WebViewClient::runFileChooser has changed.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@78 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2010-04-12 13:47:30 +00:00
parent 069e877307
commit 9f779533d1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libcef/browser_webview_delegate.cc
View File

@ -77,6 +77,7 @@ using WebKit::WebDataSource;
using WebKit::WebDragData; using WebKit::WebDragData;
using WebKit::WebDragOperationsMask; using WebKit::WebDragOperationsMask;
using WebKit::WebEditingAction; using WebKit::WebEditingAction;
using WebKit::WebFileChooserParams;
using WebKit::WebFormElement; using WebKit::WebFormElement;
using WebKit::WebFrame; using WebKit::WebFrame;
using WebKit::WebHistoryItem; using WebKit::WebHistoryItem;
@ -274,14 +275,13 @@ bool BrowserWebViewDelegate::handleCurrentKeyboardEvent() {
} }
bool BrowserWebViewDelegate::runFileChooser( bool BrowserWebViewDelegate::runFileChooser(
bool multi_select, const WebKit::WebString& title, const WebFileChooserParams& params,
const WebKit::WebString& initial_value,
WebKit::WebFileChooserCompletion* chooser_completion) { WebKit::WebFileChooserCompletion* chooser_completion) {
// Support file open dialog. // Support file open dialog.
std::vector<FilePath> file_names; std::vector<FilePath> file_names;
if(!ShowFileChooser(file_names, multi_select, title, if(!ShowFileChooser(file_names, params.multiSelect, params.title,
webkit_glue::WebStringToFilePath(initial_value))) { webkit_glue::WebStringToFilePath(params.initialValue))) {
return false; return false;
} }

4
libcef/browser_webview_delegate.h
View File

@ -22,6 +22,7 @@
#include "base/scoped_ptr.h" #include "base/scoped_ptr.h"
#include "base/weak_ptr.h" #include "base/weak_ptr.h"
#include "third_party/WebKit/WebKit/chromium/public/WebContextMenuData.h" #include "third_party/WebKit/WebKit/chromium/public/WebContextMenuData.h"
#include "third_party/WebKit/WebKit/chromium/public/WebFileChooserParams.h"
#include "third_party/WebKit/WebKit/chromium/public/WebFrameClient.h" #include "third_party/WebKit/WebKit/chromium/public/WebFrameClient.h"
#include "third_party/WebKit/WebKit/chromium/public/WebRect.h" #include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
#include "third_party/WebKit/WebKit/chromium/public/WebViewClient.h" #include "third_party/WebKit/WebKit/chromium/public/WebViewClient.h"
@ -73,8 +74,7 @@ class BrowserWebViewDelegate : public WebKit::WebViewClient,
virtual bool isSelectTrailingWhitespaceEnabled(); virtual bool isSelectTrailingWhitespaceEnabled();
virtual bool handleCurrentKeyboardEvent(); virtual bool handleCurrentKeyboardEvent();
virtual bool runFileChooser( virtual bool runFileChooser(
bool multi_select, const WebKit::WebString& title, const WebKit::WebFileChooserParams& params,
const WebKit::WebString& initial_value,
WebKit::WebFileChooserCompletion* chooser_completion); WebKit::WebFileChooserCompletion* chooser_completion);
virtual void runModalAlertDialog( virtual void runModalAlertDialog(
WebKit::WebFrame* frame, const WebKit::WebString& message); WebKit::WebFrame* frame, const WebKit::WebString& message);