Update to Chromium version 121.0.6167.0 (#1233107)

This commit is contained in:
Marshall Greenblatt
2023-12-06 15:16:15 -05:00
parent 2f0b00f8f5
commit 80c65f25a3
122 changed files with 1044 additions and 986 deletions

View File

@ -1,8 +1,8 @@
diff --git chrome/browser/printing/printer_query.cc chrome/browser/printing/printer_query.cc
index 9fefdc150acf8..6c16766e89584 100644
index 75fb743f95c37..a79ca84b4ff4c 100644
--- chrome/browser/printing/printer_query.cc
+++ chrome/browser/printing/printer_query.cc
@@ -123,6 +123,7 @@ PrinterQuery::PrinterQuery(content::GlobalRenderFrameHostId rfh_id)
@@ -124,6 +124,7 @@ PrinterQuery::PrinterQuery(content::GlobalRenderFrameHostId rfh_id)
rfh_id_(rfh_id),
cookie_(PrintSettings::NewCookie()) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@ -11,10 +11,10 @@ index 9fefdc150acf8..6c16766e89584 100644
PrinterQuery::~PrinterQuery() {
diff --git printing/printing_context.h printing/printing_context.h
index c753f04d8b73a..7607571f78119 100644
index 6db58a9992642..ac57e5c200079 100644
--- printing/printing_context.h
+++ printing/printing_context.h
@@ -176,6 +176,13 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
@@ -204,6 +204,13 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
int job_id() const { return job_id_; }
@ -26,9 +26,9 @@ index c753f04d8b73a..7607571f78119 100644
+ int render_frame_id() const { return render_frame_id_; }
+
protected:
explicit PrintingContext(Delegate* delegate);
PrintingContext(Delegate* delegate, ProcessBehavior process_behavior);
@@ -220,6 +227,10 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
@@ -234,6 +241,10 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
// The job id for the current job. The value is 0 if no jobs are active.
int job_id_;
@ -37,5 +37,5 @@ index c753f04d8b73a..7607571f78119 100644
+ int render_frame_id_ = 0;
+
private:
#if BUILDFLAG(ENABLE_OOP_PRINTING)
// If this instance of PrintingContext should skip making any system calls
const ProcessBehavior process_behavior_;
};