bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 71.0.3578.0 (#599034)

Browse Source
This commit is contained in:
Marshall Greenblatt
2018-10-24 16:37:39 -04:00
parent f9ebe693e4
commit 315b57e9f7
63 changed files with 505 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libcef/browser/file_dialog_manager.h
View File

@ -15,8 +15,9 @@
#include "content/public/browser/web_contents_observer.h"
namespace content {
class FileSelectListener;
class WebContents;
}
} // namespace content
namespace net {
class DirectoryLister;
@ -24,12 +25,12 @@ class DirectoryLister;
class CefBrowserHostImpl;
class CefFileDialogManager : public content::WebContentsObserver {
class CefFileDialogManager {
public:
// |runner| may be NULL if the platform doesn't implement dialogs.
CefFileDialogManager(CefBrowserHostImpl* browser,
std::unique_ptr<CefFileDialogRunner> runner);
~CefFileDialogManager() override;
~CefFileDialogManager();
// Delete the runner to free any platform constructs.
void Destroy();
@ -45,7 +46,7 @@ class CefFileDialogManager : public content::WebContentsObserver {
// Called from CefBrowserHostImpl::RunFileChooser.
// See WebContentsDelegate::RunFileChooser documentation.
void RunFileChooser(content::RenderFrameHost* render_frame_host,
void RunFileChooser(std::unique_ptr<content::FileSelectListener> listener,
const blink::mojom::FileChooserParams& params);
// Run the file chooser dialog specified by |params|. Only a single dialog may
@ -57,7 +58,6 @@ class CefFileDialogManager : public content::WebContentsObserver {
private:
void RunFileChooserInternal(
content::RenderFrameHost* render_frame_host,
const CefFileDialogRunner::FileChooserParams& params,
const CefFileDialogRunner::RunFileChooserCallback& callback);
@ -72,6 +72,7 @@ class CefFileDialogManager : public content::WebContentsObserver {
// blink::mojom::FileChooserParams::Mode::kUploadFolder.
void OnRunFileChooserUploadFolderDelegateCallback(
const blink::mojom::FileChooserParams::Mode mode,
std::unique_ptr<content::FileSelectListener> listener,
int selected_accept_filter,
const std::vector<base::FilePath>& file_paths);
@ -79,15 +80,13 @@ class CefFileDialogManager : public content::WebContentsObserver {
// RenderFrameHost.
void OnRunFileChooserDelegateCallback(
blink::mojom::FileChooserParams::Mode mode,
std::unique_ptr<content::FileSelectListener> listener,
int selected_accept_filter,
const std::vector<base::FilePath>& file_paths);
// Clean up state associated with the last run.
void Cleanup();
// WebContentsObserver methods:
void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;
// CefBrowserHostImpl pointer is guaranteed to outlive this object.
CefBrowserHostImpl* browser_;
@ -96,9 +95,6 @@ class CefFileDialogManager : public content::WebContentsObserver {
// True if a file chooser is currently pending.
bool file_chooser_pending_;
// RenderFrameHost associated with the pending file chooser. May be nullptr.
content::RenderFrameHost* render_frame_host_;
// Used for asynchronously listing directory contents.
std::unique_ptr<net::DirectoryLister> lister_;