Update to Chromium version 105.0.5176.0 (#1023155)

This commit is contained in:
Marshall Greenblatt
2022-07-21 13:26:10 -04:00
parent 5e753d211f
commit e9f29ab3d6
92 changed files with 615 additions and 700 deletions

View File

@ -0,0 +1,31 @@
diff --git printing/printing_context_linux.cc printing/printing_context_linux.cc
index 805156b4d7b70..2fbf7fecef01f 100644
--- printing/printing_context_linux.cc
+++ printing/printing_context_linux.cc
@@ -48,9 +48,11 @@ PrintingContextLinux::~PrintingContextLinux() {
}
// static
-void PrintingContextLinuxDelegate::SetInstance(
+PrintingContextLinuxDelegate* PrintingContextLinuxDelegate::SetInstance(
PrintingContextLinuxDelegate* delegate) {
+ auto old_delegate = g_delegate;
g_delegate = delegate;
+ return old_delegate;
}
void PrintingContextLinux::AskUserForSettings(int max_pages,
diff --git printing/printing_context_linux.h printing/printing_context_linux.h
index dfe49bc00adea..3faa2a3dff79d 100644
--- printing/printing_context_linux.h
+++ printing/printing_context_linux.h
@@ -27,7 +27,8 @@ class COMPONENT_EXPORT(PRINTING) PrintingContextLinuxDelegate {
virtual gfx::Size GetPdfPaperSize(PrintingContextLinux* context) = 0;
- static void SetInstance(PrintingContextLinuxDelegate* delegate);
+ static PrintingContextLinuxDelegate* SetInstance(
+ PrintingContextLinuxDelegate* delegate);
};
// PrintingContext with optional native UI for print dialog and pdf_paper_size.