mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Set enable_alloy_bootstrap=false to build with Alloy bootstrap code removed. Extension API is documented as deprecated in comments but not compiled out with this arg.
This commit is contained in:
@@ -27,7 +27,7 @@ index 5d1658999d5bb..d1b7b7288c946 100644
|
||||
$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
|
||||
index c85248ab0d0a0..1595d2aa62bce 100644
|
||||
--- chrome/browser/ui/webui/constrained_web_dialog_ui.cc
|
||||
+++ chrome/browser/ui/webui/constrained_web_dialog_ui.cc
|
||||
@@ -13,6 +13,7 @@
|
||||
@@ -38,18 +38,22 @@ index c85248ab0d0a0..05b3454c0356d 100644
|
||||
#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
|
||||
@@ -56,7 +57,13 @@ class ConstrainedWebDialogDelegateUserData
|
||||
ConstrainedWebDialogUI::ConstrainedWebDialogUI(content::WebUI* web_ui)
|
||||
: WebUIController(web_ui) {
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
+#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
|
||||
+ if (!cef::IsAlloyRuntimeEnabled()) {
|
||||
+#endif
|
||||
extensions::TabHelper::CreateForWebContents(web_ui->GetWebContents());
|
||||
+#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
|
||||
+ }
|
||||
+#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
diff --git chrome/browser/ui/webui/print_preview/print_preview_ui.cc chrome/browser/ui/webui/print_preview/print_preview_ui.cc
|
||||
index 449f6f2db551e..677eecde93352 100644
|
||||
index 449f6f2db551e..96cc73b2ca43b 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 @@
|
||||
@@ -60,21 +64,23 @@ index 449f6f2db551e..677eecde93352 100644
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/browser/enterprise/browser_management/management_service_factory.h"
|
||||
#include "chrome/browser/pdf/pdf_extension_util.h"
|
||||
@@ -109,6 +110,13 @@ const char16_t kBasicPrintShortcut[] = u"(\u2325\u2318P)";
|
||||
@@ -109,6 +110,15 @@ const char16_t kBasicPrintShortcut[] = u"(\u2325\u2318P)";
|
||||
const char16_t kBasicPrintShortcut[] = u"(Ctrl+Shift+P)";
|
||||
#endif
|
||||
|
||||
+const char16_t* GetBasicPrintShortcut() {
|
||||
+#if BUILDFLAG(ENABLE_ALLOY_BOOTSTRAP)
|
||||
+ if (cef::IsAlloyRuntimeEnabled()) {
|
||||
+ return u"";
|
||||
+ }
|
||||
+#endif
|
||||
+ return kBasicPrintShortcut;
|
||||
+}
|
||||
+
|
||||
constexpr char kInvalidArgsForDidStartPreview[] =
|
||||
"Invalid arguments for DidStartPreview";
|
||||
constexpr char kInvalidPageIndexForDidPreviewPage[] =
|
||||
@@ -310,7 +318,7 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) {
|
||||
@@ -310,7 +320,7 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) {
|
||||
source->AddLocalizedStrings(kLocalizedStrings);
|
||||
|
||||
#if !BUILDFLAG(IS_CHROMEOS)
|
||||
|
Reference in New Issue
Block a user