Skip to content

Commit b0e2a7e

Browse files
jkleinscjkleinsc
committed
fixup: only disable enterprise_cloud_content_analysis
The original commit a5480ac, was due to this CL 5527572: Move Connectors prefs files to components/enterprise/connectors/ | https://chromium-review.googlesource.com/c/chromium/src/+/5527572
1 parent b2800a2 commit b0e2a7e

File tree

1 file changed

+80
-4
lines changed

1 file changed

+80
-4
lines changed

‎patches/chromium/printing.patch

+80-4
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ index 163eacc8bb6654880d37111923a87ea5a6134485..565258e9bd4cc52e347e1f4a72ee29ec
9191
: PdfRenderSettings::Mode::POSTSCRIPT_LEVEL3;
9292
}
9393
diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
94-
index c68d3d2f7fdaab62aac24b79e0cf71e0eb84cf72..6ce7dbf1d53564fe9d046cf6615cc2e8b203fb2e 100644
94+
index c68d3d2f7fdaab62aac24b79e0cf71e0eb84cf72..3084546bee021eb2752335b8d31d48d28a6e5af1 100644
9595
--- a/chrome/browser/printing/print_view_manager_base.cc
9696
+++ b/chrome/browser/printing/print_view_manager_base.cc
9797
@@ -87,6 +87,20 @@ namespace printing {
@@ -187,6 +187,15 @@ index c68d3d2f7fdaab62aac24b79e0cf71e0eb84cf72..6ce7dbf1d53564fe9d046cf6615cc2e8
187187

188188
for (auto& observer : GetTestObservers()) {
189189
observer.OnPrintNow(rfh);
190+
@@ -295,7 +319,7 @@ void PrintViewManagerBase::PrintDocument(
191+
const gfx::Size& page_size,
192+
const gfx::Rect& content_area,
193+
const gfx::Point& offsets) {
194+
-#if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS)
195+
+#if 0
196+
if (content_analysis_before_printing_document_) {
197+
std::move(content_analysis_before_printing_document_)
198+
.Run(print_data, page_size, content_area, offsets);
190199
@@ -342,12 +366,13 @@ void PrintViewManagerBase::OnDidUpdatePrintableArea(
191200
}
192201
PRINTER_LOG(EVENT) << "Paper printable area updated for vendor id "
@@ -223,6 +232,33 @@ index c68d3d2f7fdaab62aac24b79e0cf71e0eb84cf72..6ce7dbf1d53564fe9d046cf6615cc2e8
223232
set_cookie(settings->params->document_cookie);
224233
std::move(callback).Run(std::move(settings));
225234
}
235+
@@ -436,7 +466,7 @@ void PrintViewManagerBase::StartLocalPrintJob(
236+
PrinterHandler::PrintCallback callback) {
237+
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
238+
239+
-#if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS)
240+
+#if 0
241+
// Populating `content_analysis_before_printing_document_` if needed should be
242+
// done first in this function's workflow, this way other code can check if
243+
// content analysis is going to happen and delay starting `print_job_` to
244+
@@ -669,7 +699,7 @@ void PrintViewManagerBase::GetDefaultPrintSettings(
245+
246+
#if BUILDFLAG(ENABLE_OOP_PRINTING)
247+
if (ShouldPrintJobOop() &&
248+
-#if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS)
249+
+#if 0
250+
!analyzing_content_ &&
251+
#endif
252+
!query_with_ui_client_id().has_value()) {
253+
@@ -697,7 +727,7 @@ void PrintViewManagerBase::GetDefaultPrintSettings(
254+
255+
// Sometimes it is desired to get the PDF settings as opposed to the settings
256+
// of the default system print driver.
257+
-#if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS)
258+
+#if 0
259+
bool want_pdf_settings = analyzing_content_;
260+
#else
261+
bool want_pdf_settings = false;
226262
@@ -741,10 +771,7 @@ void PrintViewManagerBase::UpdatePrintSettings(
227263
// `job_settings` does not yet contain the rasterized PDF dpi, so if the user
228264
// has the print preference set, fetch it for use in
@@ -278,6 +314,15 @@ index c68d3d2f7fdaab62aac24b79e0cf71e0eb84cf72..6ce7dbf1d53564fe9d046cf6615cc2e8
278314
}
279315

280316
void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
317+
@@ -834,7 +873,7 @@ void PrintViewManagerBase::ScriptedPrint(mojom::ScriptedPrintParamsPtr params,
318+
return;
319+
}
320+
#endif
321+
-#if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS)
322+
+#if 0
323+
std::optional<enterprise_connectors::ContentAnalysisDelegate::Data>
324+
scanning_data = enterprise_data_protection::GetPrintAnalysisData(
325+
web_contents(), enterprise_data_protection::PrintScanningContext::
281326
@@ -864,11 +903,9 @@ void PrintViewManagerBase::PrintingFailed(int32_t cookie,
282327
// destroyed. In such cases the error notification to the user will
283328
// have already been displayed, and a second message should not be
@@ -382,6 +427,15 @@ index c68d3d2f7fdaab62aac24b79e0cf71e0eb84cf72..6ce7dbf1d53564fe9d046cf6615cc2e8
382427
return true;
383428
}
384429

430+
@@ -1105,7 +1159,7 @@ void PrintViewManagerBase::ReleasePrintJob() {
431+
// Ensure that any residual registration of printing client is released.
432+
// This might be necessary in some abnormal cases, such as the associated
433+
// render process having terminated.
434+
-#if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS)
435+
+#if 0
436+
if (!analyzing_content_) {
437+
UnregisterSystemPrintClient();
438+
}
385439
@@ -1115,6 +1169,11 @@ void PrintViewManagerBase::ReleasePrintJob() {
386440
}
387441
#endif
@@ -412,6 +466,15 @@ index c68d3d2f7fdaab62aac24b79e0cf71e0eb84cf72..6ce7dbf1d53564fe9d046cf6615cc2e8
412466
return true;
413467

414468
if (!cookie) {
469+
@@ -1187,7 +1246,7 @@ bool PrintViewManagerBase::OpportunisticallyCreatePrintJob(int cookie) {
470+
return false;
471+
}
472+
473+
-#if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS)
474+
+#if 0
475+
// Don't start printing if enterprise checks are being performed to check if
476+
// printing is allowed, or if content analysis is going to take place right
477+
// before starting `print_job_`.
415478
@@ -1318,6 +1377,8 @@ void PrintViewManagerBase::CompleteScriptedPrint(
416479
auto callback_wrapper = base::BindOnce(
417480
&PrintViewManagerBase::ScriptedPrintReply, weak_ptr_factory_.GetWeakPtr(),
@@ -421,17 +484,21 @@ index c68d3d2f7fdaab62aac24b79e0cf71e0eb84cf72..6ce7dbf1d53564fe9d046cf6615cc2e8
421484
#if BUILDFLAG(IS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
422485
DisableThirdPartyBlocking();
423486
#endif
424-
@@ -1332,7 +1393,7 @@ void PrintViewManagerBase::CompleteScriptedPrint(
487+
@@ -1332,10 +1393,10 @@ void PrintViewManagerBase::CompleteScriptedPrint(
425488
params->expected_pages_count, params->has_selection, params->margin_type,
426489
params->is_scripted, !render_process_host->IsPdf(),
427490
base::BindOnce(&OnDidScriptedPrint, queue_, std::move(printer_query),
428491
- std::move(callback_wrapper)));
429492
+ std::move(callback_wrapper), std::move(cancel_job_wrapper)));
430493
}
431494

432-
#if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS)
495+
-#if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS)
496+
+#if 0
497+
void PrintViewManagerBase::CompletePrintDocumentAfterContentAnalysis(
498+
scoped_refptr<base::RefCountedMemory> print_data,
499+
const gfx::Size& page_size,
433500
diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
434-
index 1917f8b94962d7a4c83f139623a5f5d352011627..1fcc90cf6f9c143b956d9d9422098e85bbf54b21 100644
501+
index 1917f8b94962d7a4c83f139623a5f5d352011627..47ef610c43c4dcfee0cf528eb2e6075b579117ee 100644
435502
--- a/chrome/browser/printing/print_view_manager_base.h
436503
+++ b/chrome/browser/printing/print_view_manager_base.h
437504
@@ -52,6 +52,8 @@ class PrinterQuery;
@@ -480,6 +547,15 @@ index 1917f8b94962d7a4c83f139623a5f5d352011627..1fcc90cf6f9c143b956d9d9422098e85
480547
protected:
481548
#if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS)
482549
using PrintDocumentCallback =
550+
@@ -229,7 +243,7 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
551+
mojom::ScriptedPrintParamsPtr params,
552+
ScriptedPrintCallback callback);
553+
554+
-#if BUILDFLAG(ENTERPRISE_CONTENT_ANALYSIS)
555+
+#if 0
556+
// Helper method bound to `content_analysis_before_printing_document_` when
557+
// content analysis should happen right before the document is to be printed.
558+
// This method is virtual for testing purposes.
483559
@@ -293,6 +307,7 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer {
484560
bool success);
485561
#endif

0 commit comments

Comments
 (0)