diff --git chrome/browser/download/download_prefs.cc chrome/browser/download/download_prefs.cc index 69a0e4c0e6fb..6751d51b8435 100644 --- chrome/browser/download/download_prefs.cc +++ chrome/browser/download/download_prefs.cc @@ -23,6 +23,7 @@ #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" +#include "cef/libcef/features/runtime.h" #include "chrome/browser/download/chrome_download_manager_delegate.h" #include "chrome/browser/download/download_core_service_factory.h" #include "chrome/browser/download/download_core_service_impl.h" @@ -57,6 +58,10 @@ #include "chrome/browser/ui/pdf/adobe_reader_info_win.h" #endif +#if BUILDFLAG(ENABLE_CEF) +#include "cef/libcef/browser/alloy/alloy_browser_context.h" +#endif + using content::BrowserContext; using content::BrowserThread; using content::DownloadManager; @@ -357,6 +362,11 @@ DownloadPrefs* DownloadPrefs::FromDownloadManager( // static DownloadPrefs* DownloadPrefs::FromBrowserContext( content::BrowserContext* context) { +#if BUILDFLAG(ENABLE_CEF) + if (cef::IsAlloyRuntimeEnabled()) { + return static_cast(context)->GetDownloadPrefs(); + } +#endif return FromDownloadManager(BrowserContext::GetDownloadManager(context)); } diff --git chrome/browser/printing/print_preview_dialog_controller.cc chrome/browser/printing/print_preview_dialog_controller.cc index 3fadaba3336f..5ef67b35883d 100644 --- chrome/browser/printing/print_preview_dialog_controller.cc +++ chrome/browser/printing/print_preview_dialog_controller.cc @@ -16,6 +16,7 @@ #include "base/strings/utf_string_conversions.h" #include "build/branding_buildflags.h" #include "build/build_config.h" +#include "cef/libcef/features/features.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" #include "chrome/browser/printing/print_view_manager.h" @@ -451,8 +452,11 @@ WebContents* PrintPreviewDialogController::CreatePrintPreviewDialog( content::HostZoomMap::Get(preview_dialog->GetSiteInstance()) ->SetZoomLevelForHostAndScheme(print_url.scheme(), print_url.host(), 0); PrintViewManager::CreateForWebContents(preview_dialog); + +#if !BUILDFLAG(ENABLE_CEF) extensions::ChromeExtensionWebContentsObserver::CreateForWebContents( preview_dialog); +#endif // Add an entry to the map. preview_dialog_map_[preview_dialog] = initiator; diff --git chrome/browser/printing/print_view_manager_base.cc chrome/browser/printing/print_view_manager_base.cc index 277f2ca033d1..06465c4616a3 100644 --- chrome/browser/printing/print_view_manager_base.cc +++ chrome/browser/printing/print_view_manager_base.cc @@ -21,6 +21,7 @@ #include "base/threading/thread_task_runner_handle.h" #include "base/timer/timer.h" #include "build/build_config.h" +#include "cef/libcef/features/runtime.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/printing/print_job.h" @@ -61,6 +62,10 @@ #include "printing/printing_features.h" #endif +#if BUILDFLAG(ENABLE_CEF) +#include "cef/libcef/browser/printing/print_view_manager.h" +#endif + #if BUILDFLAG(ENABLE_PRINT_PREVIEW) #include "chrome/browser/printing/print_error_dialog.h" #endif @@ -196,8 +201,11 @@ PrintViewManager* GetPrintViewManager(int render_process_id, DCHECK_CURRENTLY_ON(content::BrowserThread::UI); content::WebContents* web_contents = GetWebContentsForRenderFrame(render_process_id, render_frame_id); - return web_contents ? PrintViewManager::FromWebContents(web_contents) - : nullptr; + if (!web_contents) + return nullptr; + if (cef::IsAlloyRuntimeEnabled()) + return CefPrintViewManager::FromWebContents(web_contents); + return PrintViewManager::FromWebContents(web_contents); } void NotifySystemDialogCancelled(int render_process_id, int routing_id) { diff --git chrome/browser/printing/print_view_manager_base.h chrome/browser/printing/print_view_manager_base.h index e22cff218a56..6cff432e4f08 100644 --- chrome/browser/printing/print_view_manager_base.h +++ chrome/browser/printing/print_view_manager_base.h @@ -118,9 +118,6 @@ class PrintViewManagerBase : public content::NotificationObserver, // Manages the low-level talk to the printer. scoped_refptr print_job_; - private: - friend class TestPrintViewManager; - // content::NotificationObserver implementation. void Observe(int type, const content::NotificationSource& source, @@ -132,6 +129,9 @@ class PrintViewManagerBase : public content::NotificationObserver, // Cancels the print job. void NavigationStopped() override; + private: + friend class TestPrintViewManager; + // printing::PrintManager: void OnDidPrintDocument( content::RenderFrameHost* render_frame_host, diff --git chrome/browser/resources/print_preview/ui/destination_dialog.html chrome/browser/resources/print_preview/ui/destination_dialog.html index 01ac8b5153e1..20f5e5b9d099 100644 --- chrome/browser/resources/print_preview/ui/destination_dialog.html +++ chrome/browser/resources/print_preview/ui/destination_dialog.html @@ -133,10 +133,7 @@
- - $i18n{manage} - - +
$i18n{cancel} diff --git chrome/browser/resources/print_preview/ui/destination_select.html chrome/browser/resources/print_preview/ui/destination_select.html index 6d3d49c902e7..4769176b9550 100644 --- chrome/browser/resources/print_preview/ui/destination_select.html +++ chrome/browser/resources/print_preview/ui/destination_select.html @@ -20,10 +20,6 @@ -