121 lines
5.0 KiB
Diff
121 lines
5.0 KiB
Diff
diff --git chrome/browser/download/download_prefs.cc chrome/browser/download/download_prefs.cc
|
|
index 773f72da82f90..6d0307988406f 100644
|
|
--- chrome/browser/download/download_prefs.cc
|
|
+++ chrome/browser/download/download_prefs.cc
|
|
@@ -23,6 +23,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"
|
|
@@ -64,6 +65,10 @@
|
|
#include "chrome/browser/flags/android/chrome_feature_list.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;
|
|
@@ -355,6 +360,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 54efe456fd86e..a685c4e0722cc 100644
|
|
--- chrome/browser/printing/print_preview_dialog_controller.cc
|
|
+++ chrome/browser/printing/print_preview_dialog_controller.cc
|
|
@@ -16,6 +16,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/printing/print_view_manager_base.h"
|
|
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 @@
|
|
</print-preview-destination-list>
|
|
</div>
|
|
<div slot="button-container">
|
|
- <cr-button on-click="onManageButtonClick_">
|
|
- $i18n{manage}
|
|
- <iron-icon icon="cr:open-in-new" id="manageIcon"></iron-icon>
|
|
- </cr-button>
|
|
+ <div></div>
|
|
<cr-button class="cancel-button" on-click="onCancelButtonClick_">
|
|
$i18n{cancel}
|
|
</cr-button>
|
|
diff --git chrome/browser/ui/webui/constrained_web_dialog_ui.cc chrome/browser/ui/webui/constrained_web_dialog_ui.cc
|
|
index c85248ab0d0a0..05b3454c0356d 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/render_frame_host.h"
|
|
#include "content/public/browser/web_contents.h"
|
|
#include "content/public/browser/web_ui.h"
|
|
@@ -56,7 +57,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 e01439541b904..a369dcbb31c27 100644
|
|
--- chrome/browser/ui/webui/print_preview/print_preview_ui.cc
|
|
+++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc
|
|
@@ -25,6 +25,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/enterprise/browser_management/management_service_factory.h"
|
|
#include "chrome/browser/pdf/pdf_extension_util.h"
|
|
@@ -108,6 +109,13 @@ const char16_t kBasicPrintShortcut[] = u"(\u2325\u2318P)";
|
|
const char16_t kBasicPrintShortcut[] = u"(Ctrl+Shift+P)";
|
|
#endif
|
|
|
|
+const char16_t* GetBasicPrintShortcut() {
|
|
+ if (cef::IsAlloyRuntimeEnabled()) {
|
|
+ return u"";
|
|
+ }
|
|
+ return kBasicPrintShortcut;
|
|
+}
|
|
+
|
|
constexpr char kInvalidArgsForDidStartPreview[] =
|
|
"Invalid arguments for DidStartPreview";
|
|
constexpr char kInvalidPageIndexForDidPreviewPage[] =
|
|
@@ -309,7 +317,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));
|