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

Update to Chromium version 128.0.6613.0 (#1331488)

Browse Source
This commit is contained in:
Marshall Greenblatt
2024-07-29 13:09:20 -04:00
parent a6c00b2ff6
commit 446b7d6535
96 changed files with 798 additions and 877 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
patch/patches/chrome_browser_webui_license.patch
View File

@@ -1,8 +1,8 @@
diff --git chrome/browser/ui/webui/about/about_ui.cc chrome/browser/ui/webui/about/about_ui.cc
index 7d04b86885167..b89b060efc9e0 100644
index 93efcb5a7edc0..f1cb0c791adf6 100644
--- chrome/browser/ui/webui/about/about_ui.cc
+++ chrome/browser/ui/webui/about/about_ui.cc
@@ -34,6 +34,7 @@
@@ -35,6 +35,7 @@
#include "base/values.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
@@ -10,7 +10,7 @@ index 7d04b86885167..b89b060efc9e0 100644
#include "chrome/browser/about_flags.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/profiles/profile.h"
@@ -91,6 +92,10 @@
@@ -92,6 +93,10 @@
#include "chrome/common/webui_url_constants.h"
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -21,7 +21,7 @@ index 7d04b86885167..b89b060efc9e0 100644
using content::BrowserThread;
namespace {
@@ -692,6 +697,16 @@ void AboutUIHTMLSource::StartDataRequest(
@@ -695,6 +700,16 @@ void AboutUIHTMLSource::StartDataRequest(
IDS_TERMS_HTML);
#endif
}
@@ -39,7 +39,7 @@ index 7d04b86885167..b89b060efc9e0 100644
FinishDataRequest(response, std::move(callback));
}
diff --git chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index 7b61f43d8c72a..811d075966239 100644
index 39e7681c0c708..95c3f21fc22b4 100644
--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -18,6 +18,7 @@
@@ -50,7 +50,7 @@ index 7b61f43d8c72a..811d075966239 100644
#include "chrome/browser/about_flags.h"
#include "chrome/browser/buildflags.h"
#include "chrome/browser/commerce/shopping_service_factory.h"
@@ -391,6 +392,9 @@ bool IsAboutUI(const GURL& url) {
@@ -385,6 +386,9 @@ bool IsAboutUI(const GURL& url) {
|| url.host_piece() == chrome::kChromeUIOSCreditsHost ||
url.host_piece() == chrome::kChromeUIBorealisCreditsHost ||
url.host_piece() == chrome::kChromeUICrostiniCreditsHost
@@ -60,7 +60,7 @@ index 7b61f43d8c72a..811d075966239 100644
#endif
); // NOLINT
}
@@ -1019,6 +1023,9 @@ ChromeWebUIControllerFactory::GetListOfAcceptableURLs() {
@@ -1000,6 +1004,9 @@ ChromeWebUIControllerFactory::GetListOfAcceptableURLs() {
GURL(chrome::kChromeUIGpuURL),
GURL(chrome::kChromeUIHistogramsURL),
GURL(chrome::kChromeUIInspectURL),
@@ -71,35 +71,24 @@ index 7b61f43d8c72a..811d075966239 100644
GURL(chrome::kChromeUINetExportURL),
GURL(chrome::kChromeUIPrefsInternalsURL),
diff --git chrome/common/webui_url_constants.cc chrome/common/webui_url_constants.cc
index 4604facee295e..acd8857875d6e 100644
index 248b6795e8cbe..c957f9d55613d 100644
--- chrome/common/webui_url_constants.cc
+++ chrome/common/webui_url_constants.cc
@@ -131,6 +131,10 @@ const char kChromeUILauncherInternalsHost[] = "launcher-internals";
const char kChromeUILauncherInternalsURL[] = "chrome://launcher-internals";
const char kChromeUILensSearchBubbleHost[] = "lens-search-bubble";
const char kChromeUILensSearchBubbleURL[] = "chrome://lens-search-bubble/";
@@ -99,6 +99,9 @@ base::span<const base::cstring_view> ChromeURLHosts() {
kChromeUIHistoryHost,
history_clusters_internals::kChromeUIHistoryClustersInternalsHost,
kChromeUIInterstitialHost,
+#if BUILDFLAG(ENABLE_CEF)
+const char kChromeUILicenseHost[] = "license";
+const char kChromeUILicenseURL[] = "chrome://license/";
+ kChromeUILicenseHost,
+#endif
const char kChromeUISensorInfoHost[] = "sensor-info";
const char kChromeUISensorInfoURL[] = "chrome://sensor-info/";
const char kChromeUILocalStateHost[] = "local-state";
@@ -704,6 +708,9 @@ const char* const kChromeHostURLs[] = {
kChromeUIHumanPresenceInternalsHost,
#endif
kChromeUIInterstitialHost,
+#if BUILDFLAG(ENABLE_CEF)
+ kChromeUILicenseHost,
+#endif
kChromeUILocalStateHost,
kChromeUILocalStateHost,
#if !BUILDFLAG(IS_ANDROID)
kChromeUIManagementHost,
kChromeUIManagementHost,
diff --git chrome/common/webui_url_constants.h chrome/common/webui_url_constants.h
index b1247ef8ad3ff..a4ebfe2d585a0 100644
index 70e366e816db5..87ec49d6b6636 100644
--- chrome/common/webui_url_constants.h
+++ chrome/common/webui_url_constants.h
@@ -15,6 +15,7 @@
@@ -18,6 +18,7 @@
#include "build/branding_buildflags.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
@@ -107,14 +96,14 @@ index b1247ef8ad3ff..a4ebfe2d585a0 100644
#include "chrome/common/buildflags.h"
#include "components/lens/buildflags.h"
#include "content/public/common/url_constants.h"
@@ -123,6 +124,10 @@ extern const char kChromeUILauncherInternalsHost[];
extern const char kChromeUILauncherInternalsURL[];
extern const char kChromeUILensSearchBubbleHost[];
extern const char kChromeUILensSearchBubbleURL[];
@@ -155,6 +156,10 @@ inline constexpr char kChromeUILauncherInternalsURL[] =
inline constexpr char kChromeUILensSearchBubbleHost[] = "lens-search-bubble";
inline constexpr char kChromeUILensSearchBubbleURL[] =
"chrome://lens-search-bubble/";
+#if BUILDFLAG(ENABLE_CEF)
+extern const char kChromeUILicenseHost[];
+extern const char kChromeUILicenseURL[];
+inline constexpr char kChromeUILicenseHost[] = "license";
+inline constexpr char kChromeUILicenseURL[] = "chrome://license/";
+#endif
extern const char kChromeUISensorInfoURL[];
extern const char kChromeUISensorInfoHost[];
extern const char kChromeUILocalStateHost[];
inline constexpr char kChromeUILocalStateHost[] = "local-state";
inline constexpr char kChromeUILocationInternalsHost[] = "location-internals";
inline constexpr char kChromeUIManagementHost[] = "management";