mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 116.0.5845.0 (#1160321)
This commit is contained in:
@@ -139,7 +139,7 @@ index 1ee6c28cd47bc..62fd628dffd07 100644
|
||||
params->need_local_path ? ui::SelectFileDialog::FileTypeInfo::NATIVE_PATH
|
||||
: ui::SelectFileDialog::FileTypeInfo::ANY_PATH;
|
||||
diff --git chrome/browser/file_select_helper.h chrome/browser/file_select_helper.h
|
||||
index d8d05b844383c..a18fe71e383d1 100644
|
||||
index e3a85080fd37d..2f3e8e64614d7 100644
|
||||
--- chrome/browser/file_select_helper.h
|
||||
+++ chrome/browser/file_select_helper.h
|
||||
@@ -61,7 +61,8 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
|
||||
@@ -238,10 +238,10 @@ index 101e91826023b..35456ffad43f3 100644
|
||||
paths.push_back(std::move(path));
|
||||
}
|
||||
diff --git ui/shell_dialogs/select_file_dialog.cc ui/shell_dialogs/select_file_dialog.cc
|
||||
index 4a67edd5e5ea0..dfbfd166fc33a 100644
|
||||
index e2c00b2ec1532..a2e8753766597 100644
|
||||
--- ui/shell_dialogs/select_file_dialog.cc
|
||||
+++ ui/shell_dialogs/select_file_dialog.cc
|
||||
@@ -87,8 +87,10 @@ void SelectFileDialog::SetFactory(ui::SelectFileDialogFactory* factory) {
|
||||
@@ -88,8 +88,10 @@ void SelectFileDialog::SetFactory(
|
||||
// static
|
||||
scoped_refptr<SelectFileDialog> SelectFileDialog::Create(
|
||||
Listener* listener,
|
||||
@@ -255,10 +255,10 @@ index 4a67edd5e5ea0..dfbfd166fc33a 100644
|
||||
return CreateSelectFileDialog(listener, std::move(policy));
|
||||
}
|
||||
diff --git ui/shell_dialogs/select_file_dialog.h ui/shell_dialogs/select_file_dialog.h
|
||||
index ab71dd6c559ef..71899846eab4e 100644
|
||||
index 3f1db1a9c6fd3..1f0e4af378c78 100644
|
||||
--- ui/shell_dialogs/select_file_dialog.h
|
||||
+++ ui/shell_dialogs/select_file_dialog.h
|
||||
@@ -113,7 +113,8 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
|
||||
@@ -114,7 +114,8 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
|
||||
// is refcounted and uses a background thread.
|
||||
static scoped_refptr<SelectFileDialog> Create(
|
||||
Listener* listener,
|
||||
@@ -268,7 +268,7 @@ index ab71dd6c559ef..71899846eab4e 100644
|
||||
|
||||
SelectFileDialog(const SelectFileDialog&) = delete;
|
||||
SelectFileDialog& operator=(const SelectFileDialog&) = delete;
|
||||
@@ -210,6 +211,19 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
|
||||
@@ -211,6 +212,19 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
|
||||
const GURL* caller = nullptr);
|
||||
bool HasMultipleFileTypeChoices();
|
||||
|
||||
@@ -288,7 +288,7 @@ index ab71dd6c559ef..71899846eab4e 100644
|
||||
protected:
|
||||
friend class base::RefCountedThreadSafe<SelectFileDialog>;
|
||||
|
||||
@@ -235,6 +249,11 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
|
||||
@@ -236,6 +250,11 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
|
||||
// The listener to be notified of selection completion.
|
||||
raw_ptr<Listener, DanglingUntriaged> listener_;
|
||||
|
||||
@@ -300,7 +300,7 @@ index ab71dd6c559ef..71899846eab4e 100644
|
||||
private:
|
||||
// Tests if the file selection dialog can be displayed by
|
||||
// testing if the AllowFileSelectionDialogs-Policy is
|
||||
@@ -247,8 +266,6 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
|
||||
@@ -248,8 +267,6 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
|
||||
|
||||
// Returns true if the dialog has multiple file type choices.
|
||||
virtual bool HasMultipleFileTypeChoicesImpl() = 0;
|
||||
|
Reference in New Issue
Block a user