bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-01-20 21:44:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect patch of constrained_web_dialog_ui.cc

Browse Source
This commit is contained in:
Marshall Greenblatt 2022-02-16 16:26:44 -05:00
parent efc0a67e00
commit 883b4af51d
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
patch/patches/print_preview_123.patch
View File

@ -116,29 +116,27 @@ index 920f646f06484..76c0b5e5ee04b 100644
$i18n{cancel} $i18n{cancel}
</cr-button> </cr-button>
diff --git chrome/browser/ui/webui/constrained_web_dialog_ui.cc chrome/browser/ui/webui/constrained_web_dialog_ui.cc diff --git chrome/browser/ui/webui/constrained_web_dialog_ui.cc chrome/browser/ui/webui/constrained_web_dialog_ui.cc
index 8c5ba47779d24..69dff1ae88000 100644 index 8c5ba47779d24..91a70d8715f33 100644
--- chrome/browser/ui/webui/constrained_web_dialog_ui.cc --- chrome/browser/ui/webui/constrained_web_dialog_ui.cc
+++ chrome/browser/ui/webui/constrained_web_dialog_ui.cc +++ chrome/browser/ui/webui/constrained_web_dialog_ui.cc
@@ -26,6 +26,8 @@ @@ -13,6 +13,7 @@
#include "chrome/browser/extensions/tab_helper.h" #include "base/memory/ptr_util.h"
#endif #include "base/memory/raw_ptr.h"
#include "base/values.h"
+#include "cef/libcef/features/features.h" +#include "cef/libcef/features/runtime.h"
+ #include "content/public/browser/notification_service.h"
using content::RenderFrameHost; #include "content/public/browser/render_frame_host.h"
using content::WebContents; #include "content/public/browser/web_contents.h"
using content::WebUIMessageHandler; @@ -57,7 +58,9 @@ class ConstrainedWebDialogDelegateUserData
@@ -57,8 +59,10 @@ class ConstrainedWebDialogDelegateUserData
ConstrainedWebDialogUI::ConstrainedWebDialogUI(content::WebUI* web_ui) ConstrainedWebDialogUI::ConstrainedWebDialogUI(content::WebUI* web_ui)
: WebUIController(web_ui) { : WebUIController(web_ui) {
#if BUILDFLAG(ENABLE_EXTENSIONS) #if BUILDFLAG(ENABLE_EXTENSIONS)
+#if !BUILDFLAG(ENABLE_CEF) + if (!cef::IsAlloyRuntimeEnabled()) {
extensions::TabHelper::CreateForWebContents(web_ui->GetWebContents()); extensions::TabHelper::CreateForWebContents(web_ui->GetWebContents());
+ }
#endif #endif
+#endif
} }
ConstrainedWebDialogUI::~ConstrainedWebDialogUI() = default;
diff --git chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc diff --git chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
index e5dfa76d26d86..b7dcf7a11479f 100644 index e5dfa76d26d86..b7dcf7a11479f 100644
--- chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc --- chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc