Update to Chromium version 73.0.3679.0 (#624510)

This commit is contained in:
Marshall Greenblatt
2019-02-01 16:42:40 +00:00
parent 4b0ac90ab3
commit 2e7f935b0d
92 changed files with 998 additions and 559 deletions

View File

@@ -1,20 +1,20 @@
diff --git chrome/browser/printing/print_job_worker.cc chrome/browser/printing/print_job_worker.cc
index 1e2d43fb5625..08fa8eb809e0 100644
index 961e1560aa91..e04639e54baa 100644
--- chrome/browser/printing/print_job_worker.cc
+++ chrome/browser/printing/print_job_worker.cc
@@ -147,6 +147,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id,
@@ -146,6 +146,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id,
thread_("Printing_Worker"),
weak_factory_(this) {
// The object is created in the IO thread.
DCHECK(query_->RunsTasksInCurrentSequence());
DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+ printing_context_->set_render_ids(render_process_id, render_frame_id);
}
PrintJobWorker::~PrintJobWorker() {
diff --git printing/printing_context.h printing/printing_context.h
index 885937908414..03f0f0837f80 100644
index 1704d5aa9f00..1308f57915e4 100644
--- printing/printing_context.h
+++ printing/printing_context.h
@@ -133,6 +133,13 @@ class PRINTING_EXPORT PrintingContext {
@@ -130,6 +130,13 @@ class PRINTING_EXPORT PrintingContext {
int job_id() const { return job_id_; }
@@ -28,7 +28,7 @@ index 885937908414..03f0f0837f80 100644
protected:
explicit PrintingContext(Delegate* delegate);
@@ -157,6 +164,10 @@ class PRINTING_EXPORT PrintingContext {
@@ -154,6 +161,10 @@ class PRINTING_EXPORT PrintingContext {
// The job id for the current job. The value is 0 if no jobs are active.
int job_id_;