|
@@ -10,6 +10,19 @@ majority of changes originally come from these PRs:
|
|
|
|
|
|
This patch also fixes callback for manual user cancellation and success.
|
|
|
|
|
|
+diff --git a/chrome/browser/printing/print_backend_service_manager.cc b/chrome/browser/printing/print_backend_service_manager.cc
|
|
|
+index 27eb7cf1480e7a56ab6b7d010cdee65c72e62c10..76d265b8de17244ed9d3727f1bebe730a224cd56 100644
|
|
|
+--- a/chrome/browser/printing/print_backend_service_manager.cc
|
|
|
++++ b/chrome/browser/printing/print_backend_service_manager.cc
|
|
|
+@@ -18,7 +18,7 @@
|
|
|
+ #include "base/unguessable_token.h"
|
|
|
+ #include "build/build_config.h"
|
|
|
+ #include "chrome/browser/browser_process.h"
|
|
|
+-#include "chrome/grit/generated_resources.h"
|
|
|
++#include "electron/grit/electron_resources.h"
|
|
|
+ #include "chrome/services/printing/public/mojom/print_backend_service.mojom.h"
|
|
|
+ #include "components/crash/core/common/crash_keys.h"
|
|
|
+ #include "content/public/browser/browser_thread.h"
|
|
|
diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc
|
|
|
index 6408cbee8b5a8e45c4276ed966b57c1e61ad1137..e951c41a1bd92a33e32f6835841d3935a05dde53 100644
|
|
|
--- a/chrome/browser/printing/print_job.cc
|