diff --git chrome/browser/download/download_prefs.cc chrome/browser/download/download_prefs.cc index 38132463c9216..42f67b33eed7a 100644 --- chrome/browser/download/download_prefs.cc +++ chrome/browser/download/download_prefs.cc @@ -24,6 +24,7 @@ #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "build/chromeos_buildflags.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" @@ -61,6 +62,10 @@ #include "chrome/browser/ui/pdf/adobe_reader_info_win.h" #endif +#if BUILDFLAG(ENABLE_CEF) +#include "cef/libcef/browser/alloy/alloy_download_util.h" +#endif + using content::BrowserContext; using content::BrowserThread; using content::DownloadManager; @@ -348,6 +353,11 @@ DownloadPrefs* DownloadPrefs::FromDownloadManager( // static DownloadPrefs* DownloadPrefs::FromBrowserContext( content::BrowserContext* context) { +#if BUILDFLAG(ENABLE_CEF) + if (cef::IsAlloyRuntimeEnabled()) { + return alloy::GetDownloadPrefsFromBrowserContext(context); + } +#endif return FromDownloadManager(context->GetDownloadManager()); } diff --git chrome/browser/printing/print_preview_dialog_controller.cc chrome/browser/printing/print_preview_dialog_controller.cc index 01df55a728098..0c11458c9a5bb 100644 --- chrome/browser/printing/print_preview_dialog_controller.cc +++ chrome/browser/printing/print_preview_dialog_controller.cc @@ -15,6 +15,7 @@ #include "build/branding_buildflags.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" +#include "cef/libcef/features/features.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/printing/print_view_manager.h" #include "chrome/browser/task_manager/web_contents_tags.h" diff --git chrome/browser/printing/print_view_manager_base.cc chrome/browser/printing/print_view_manager_base.cc index 4bd871e5cadc6..835656ea87729 100644 --- chrome/browser/printing/print_view_manager_base.cc +++ chrome/browser/printing/print_view_manager_base.cc @@ -610,13 +610,14 @@ void PrintViewManagerBase::UpdatePrintSettings( job_settings.Set(kSettingRasterizePdfDpi, value); } + content::RenderFrameHost* render_frame_host = GetCurrentTargetFrame(); auto callback_wrapper = base::BindOnce(&PrintViewManagerBase::UpdatePrintSettingsReply, weak_ptr_factory_.GetWeakPtr(), std::move(callback)); std::unique_ptr printer_query = queue_->PopPrinterQuery(cookie); if (!printer_query) { printer_query = - queue_->CreatePrinterQuery(content::GlobalRenderFrameHostId()); + queue_->CreatePrinterQuery(render_frame_host->GetGlobalId()); } auto* printer_query_ptr = printer_query.get(); printer_query_ptr->SetSettings( diff --git chrome/browser/printing/print_view_manager_base.h chrome/browser/printing/print_view_manager_base.h index 746df417a23f7..dddf164ce6c4d 100644 --- chrome/browser/printing/print_view_manager_base.h +++ chrome/browser/printing/print_view_manager_base.h @@ -194,9 +194,6 @@ class PrintViewManagerBase : public PrintManager, public PrintJob::Observer { // Manages the low-level talk to the printer. scoped_refptr print_job_; - private: - friend class TestPrintViewManager; - // content::WebContentsObserver implementation. void RenderFrameHostStateChanged( 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 5d1658999d5bb..d1b7b7288c946 100644 --- chrome/browser/resources/print_preview/ui/destination_dialog.html +++ chrome/browser/resources/print_preview/ui/destination_dialog.html @@ -15,10 +15,7 @@
- - $i18n{manage} - - +
$i18n{cancel} diff --git chrome/browser/ui/webui/constrained_web_dialog_ui.cc chrome/browser/ui/webui/constrained_web_dialog_ui.cc index 7a3fbc44629e6..578422e85320a 100644 --- chrome/browser/ui/webui/constrained_web_dialog_ui.cc +++ chrome/browser/ui/webui/constrained_web_dialog_ui.cc @@ -13,6 +13,7 @@ #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/values.h" +#include "cef/libcef/features/runtime.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/web_contents.h" @@ -57,7 +58,9 @@ class ConstrainedWebDialogDelegateUserData ConstrainedWebDialogUI::ConstrainedWebDialogUI(content::WebUI* web_ui) : WebUIController(web_ui) { #if BUILDFLAG(ENABLE_EXTENSIONS) + if (!cef::IsAlloyRuntimeEnabled()) { extensions::TabHelper::CreateForWebContents(web_ui->GetWebContents()); + } #endif } diff --git chrome/browser/ui/webui/print_preview/print_preview_ui.cc chrome/browser/ui/webui/print_preview/print_preview_ui.cc index 2ac094eb3a9be..0656515221072 100644 --- chrome/browser/ui/webui/print_preview/print_preview_ui.cc +++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc @@ -22,6 +22,7 @@ #include "base/values.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" +#include "cef/libcef/features/runtime.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/pdf/pdf_extension_util.h" #include "chrome/browser/printing/background_printing_manager.h" @@ -96,6 +97,13 @@ const char16_t kBasicPrintShortcut[] = u"\u0028\u21e7\u2318\u0050\u0029"; const char16_t kBasicPrintShortcut[] = u"(Ctrl+Alt+P)"; #endif +const char16_t* GetBasicPrintShortcut() { + if (cef::IsAlloyRuntimeEnabled()) { + return u""; + } + return kBasicPrintShortcut; +} + constexpr char kInvalidArgsForDidStartPreview[] = "Invalid arguments for DidStartPreview"; constexpr char kInvalidPageNumberForDidPreviewPage[] = @@ -324,7 +332,7 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) { source->AddLocalizedStrings(kLocalizedStrings); #if !BUILDFLAG(IS_CHROMEOS) - const std::u16string shortcut_text(kBasicPrintShortcut); + const std::u16string shortcut_text(GetBasicPrintShortcut()); source->AddString("systemDialogOption", l10n_util::GetStringFUTF16( IDS_PRINT_PREVIEW_SYSTEM_DIALOG_OPTION, shortcut_text));