mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 104.0.5112.48
This commit is contained in:
committed by
Marshall Greenblatt
parent
ca90a945cc
commit
dac76df7e3
@@ -7,6 +7,6 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/104.0.5112.39',
|
'chromium_checkout': 'refs/tags/104.0.5112.48',
|
||||||
'depot_tools_checkout': '350d210871'
|
'depot_tools_checkout': '350d210871'
|
||||||
}
|
}
|
||||||
|
@@ -234,10 +234,10 @@ index 653170ba60e83..677df89f93e8d 100644
|
|||||||
// Initializes with predefined settings.
|
// Initializes with predefined settings.
|
||||||
void InitWithSettings(std::unique_ptr<PrintSettings> settings);
|
void InitWithSettings(std::unique_ptr<PrintSettings> settings);
|
||||||
diff --git ui/shell_dialogs/execute_select_file_win.cc ui/shell_dialogs/execute_select_file_win.cc
|
diff --git ui/shell_dialogs/execute_select_file_win.cc ui/shell_dialogs/execute_select_file_win.cc
|
||||||
index 063d4c7c96cba..24bd0533af65b 100644
|
index 162dbc3aeb4ea..41b73a5a2f4e4 100644
|
||||||
--- ui/shell_dialogs/execute_select_file_win.cc
|
--- ui/shell_dialogs/execute_select_file_win.cc
|
||||||
+++ ui/shell_dialogs/execute_select_file_win.cc
|
+++ ui/shell_dialogs/execute_select_file_win.cc
|
||||||
@@ -289,9 +289,7 @@ bool ExecuteSelectSingleFile(HWND owner,
|
@@ -290,9 +290,7 @@ bool ExecuteSelectSingleFile(HWND owner,
|
||||||
const std::vector<FileFilterSpec>& filter,
|
const std::vector<FileFilterSpec>& filter,
|
||||||
int* filter_index,
|
int* filter_index,
|
||||||
std::vector<base::FilePath>* paths) {
|
std::vector<base::FilePath>* paths) {
|
||||||
@@ -248,7 +248,7 @@ index 063d4c7c96cba..24bd0533af65b 100644
|
|||||||
default_path, filter, 0, filter_index, paths);
|
default_path, filter, 0, filter_index, paths);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -303,14 +301,13 @@ bool ExecuteSelectMultipleFile(HWND owner,
|
@@ -304,14 +302,13 @@ bool ExecuteSelectMultipleFile(HWND owner,
|
||||||
std::vector<base::FilePath>* paths) {
|
std::vector<base::FilePath>* paths) {
|
||||||
DWORD dialog_options = FOS_ALLOWMULTISELECT;
|
DWORD dialog_options = FOS_ALLOWMULTISELECT;
|
||||||
|
|
||||||
@@ -265,7 +265,7 @@ index 063d4c7c96cba..24bd0533af65b 100644
|
|||||||
const base::FilePath& default_path,
|
const base::FilePath& default_path,
|
||||||
const std::vector<FileFilterSpec>& filter,
|
const std::vector<FileFilterSpec>& filter,
|
||||||
const std::wstring& def_ext,
|
const std::wstring& def_ext,
|
||||||
@@ -323,9 +320,7 @@ bool ExecuteSaveFile(HWND owner,
|
@@ -324,9 +321,7 @@ bool ExecuteSaveFile(HWND owner,
|
||||||
|
|
||||||
DWORD dialog_options = FOS_OVERWRITEPROMPT;
|
DWORD dialog_options = FOS_OVERWRITEPROMPT;
|
||||||
|
|
||||||
@@ -276,7 +276,7 @@ index 063d4c7c96cba..24bd0533af65b 100644
|
|||||||
dialog_options, def_ext, filter_index, path);
|
dialog_options, def_ext, filter_index, path);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -390,7 +385,7 @@ void ExecuteSelectFile(
|
@@ -418,7 +413,7 @@ void ExecuteSelectFile(
|
||||||
break;
|
break;
|
||||||
case SelectFileDialog::SELECT_SAVEAS_FILE: {
|
case SelectFileDialog::SELECT_SAVEAS_FILE: {
|
||||||
base::FilePath path;
|
base::FilePath path;
|
||||||
|
@@ -62,7 +62,7 @@ index c2836d15eba30..0c03c2b4666a6 100644
|
|||||||
std::unique_ptr<permissions::PermissionPrompt> CreatePermissionPrompt(
|
std::unique_ptr<permissions::PermissionPrompt> CreatePermissionPrompt(
|
||||||
content::WebContents* web_contents,
|
content::WebContents* web_contents,
|
||||||
diff --git chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc
|
diff --git chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc
|
||||||
index 70e37336a5001..a2df1bd28c994 100644
|
index acbfad1053e0b..d4e85938bfc46 100644
|
||||||
--- chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc
|
--- chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc
|
||||||
+++ chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc
|
+++ chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc
|
||||||
@@ -100,11 +100,28 @@ bool ShouldBubbleStartOpen(permissions::PermissionPrompt::Delegate* delegate) {
|
@@ -100,11 +100,28 @@ bool ShouldBubbleStartOpen(permissions::PermissionPrompt::Delegate* delegate) {
|
||||||
|
Reference in New Issue
Block a user