Update to Chromium version 78.0.3904.0 (#693954)

This commit is contained in:
Marshall Greenblatt
2019-10-01 13:55:16 +00:00
parent c8b457da38
commit f8e0797773
151 changed files with 1485 additions and 2238 deletions

View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/printing/print_job_worker.cc chrome/browser/printing/print_job_worker.cc
index 63f432b58371..fe664e69427a 100644
index 13f9d7af3ae7..22d991fc1c14 100644
--- chrome/browser/printing/print_job_worker.cc
+++ chrome/browser/printing/print_job_worker.cc
@@ -130,6 +130,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id, int render_frame_id)
@@ -11,10 +11,10 @@ index 63f432b58371..fe664e69427a 100644
PrintJobWorker::~PrintJobWorker() {
diff --git printing/printing_context.h printing/printing_context.h
index 9ccc1a6680bc..c0494a1cc2e2 100644
index 6a5a7c90ef5b..04c0535046dc 100644
--- printing/printing_context.h
+++ printing/printing_context.h
@@ -129,6 +129,13 @@ class PRINTING_EXPORT PrintingContext {
@@ -131,6 +131,13 @@ class PRINTING_EXPORT PrintingContext {
int job_id() const { return job_id_; }
@@ -28,7 +28,7 @@ index 9ccc1a6680bc..c0494a1cc2e2 100644
protected:
explicit PrintingContext(Delegate* delegate);
@@ -153,6 +160,10 @@ class PRINTING_EXPORT PrintingContext {
@@ -155,6 +162,10 @@ class PRINTING_EXPORT PrintingContext {
// The job id for the current job. The value is 0 if no jobs are active.
int job_id_;