bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cef/patch/patches/chrome_browser_webui_licens...

152 lines
6.0 KiB
Diff
Raw Normal View History

Remove custom chrome scheme handling (see #3685) - Add CEF info to existing chrome://version WebUI. - Move chrome://license handling to WebUI. - Remove chrome://webui-hosts; use chrome://chrome-urls instead. - Remove chrome://extension-support; navigate to docs directly instead.
2024-07-03 19:07:46 +02:00
diff --git chrome/browser/ui/webui/about/about_ui.cc chrome/browser/ui/webui/about/about_ui.cc
Update to Chromium version 129.0.6668.0 - Mac: Minimum system version is now 11.0. - Win: Windows SDK version is now 10.0.22621.2428.
2024-08-26 14:44:25 +02:00
index 63e740fe81847..ea422ae7bbda4 100644
Remove custom chrome scheme handling (see #3685) - Add CEF info to existing chrome://version WebUI. - Move chrome://license handling to WebUI. - Remove chrome://webui-hosts; use chrome://chrome-urls instead. - Remove chrome://extension-support; navigate to docs directly instead.
2024-07-03 19:07:46 +02:00
--- chrome/browser/ui/webui/about/about_ui.cc
+++ chrome/browser/ui/webui/about/about_ui.cc
Update to Chromium version 129.0.6668.0 - Mac: Minimum system version is now 11.0. - Win: Windows SDK version is now 10.0.22621.2428.
2024-08-26 14:44:25 +02:00
@@ -92,6 +92,10 @@
Remove custom chrome scheme handling (see #3685) - Add CEF info to existing chrome://version WebUI. - Move chrome://license handling to WebUI. - Remove chrome://webui-hosts; use chrome://chrome-urls instead. - Remove chrome://extension-support; navigate to docs directly instead.
2024-07-03 19:07:46 +02:00
#include "chrome/common/webui_url_constants.h"
#endif // BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(ENABLE_CEF)
+#include "cef/grit/cef_resources.h"
+#endif
+
using content::BrowserThread;
namespace {
Update to Chromium version 129.0.6668.0 - Mac: Minimum system version is now 11.0. - Win: Windows SDK version is now 10.0.22621.2428.
2024-08-26 14:44:25 +02:00
@@ -624,6 +628,11 @@ ChromeURLsUIConfig::ChromeURLsUIConfig()
CreditsUIConfig::CreditsUIConfig()
: AboutUIConfigBase(chrome::kChromeUICreditsHost) {}
+#if BUILDFLAG(ENABLE_CEF)
+ChromeUILicenseConfig::ChromeUILicenseConfig()
+ : AboutUIConfigBase(chrome::kChromeUILicenseHost) {}
+#endif
+
#if !BUILDFLAG(IS_ANDROID)
TermsUIConfig::TermsUIConfig()
: AboutUIConfigBase(chrome::kChromeUITermsHost) {}
@@ -725,6 +734,16 @@ void AboutUIHTMLSource::StartDataRequest(
Remove custom chrome scheme handling (see #3685) - Add CEF info to existing chrome://version WebUI. - Move chrome://license handling to WebUI. - Remove chrome://webui-hosts; use chrome://chrome-urls instead. - Remove chrome://extension-support; navigate to docs directly instead.
2024-07-03 19:07:46 +02:00
IDS_TERMS_HTML);
#endif
}
+#if BUILDFLAG(ENABLE_CEF)
+ else if (source_name_ == chrome::kChromeUILicenseHost) {
+ response =
+ "<html><head><title>CEF License</title></head>"
+ "<body bgcolor=\"white\"><pre>" +
+ ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(
+ IDR_CEF_LICENSE_TXT) +
+ "</pre></body></html>";
+ }
+#endif
FinishDataRequest(response, std::move(callback));
}
Update to Chromium version 129.0.6668.0 - Mac: Minimum system version is now 11.0. - Win: Windows SDK version is now 10.0.22621.2428.
2024-08-26 14:44:25 +02:00
diff --git chrome/browser/ui/webui/about/about_ui.h chrome/browser/ui/webui/about/about_ui.h
index 6548d519c3da9..645163f69f822 100644
--- chrome/browser/ui/webui/about/about_ui.h
+++ chrome/browser/ui/webui/about/about_ui.h
@@ -11,6 +11,7 @@
#include "base/memory/raw_ptr.h"
#include "build/build_config.h"
+#include "cef/libcef/features/features.h"
#include "content/public/browser/url_data_source.h"
#include "content/public/browser/web_ui_controller.h"
#include "content/public/browser/webui_config.h"
@@ -42,6 +43,13 @@ class CreditsUIConfig : public AboutUIConfigBase {
CreditsUIConfig();
};
+#if BUILDFLAG(ENABLE_CEF)
+class ChromeUILicenseConfig : public AboutUIConfigBase {
+ public:
+ ChromeUILicenseConfig();
+};
+#endif
+
#if !BUILDFLAG(IS_ANDROID)
// chrome://terms
class TermsUIConfig : public AboutUIConfigBase {
diff --git chrome/browser/ui/webui/chrome_web_ui_configs.cc chrome/browser/ui/webui/chrome_web_ui_configs.cc
index 07e648356a5fb..b284630f01b3a 100644
--- chrome/browser/ui/webui/chrome_web_ui_configs.cc
+++ chrome/browser/ui/webui/chrome_web_ui_configs.cc
@@ -6,6 +6,7 @@
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
+#include "cef/libcef/features/features.h"
#include "chrome/browser/ui/webui/about/about_ui.h"
#include "chrome/browser/ui/webui/accessibility/accessibility_ui.h"
#include "chrome/browser/ui/webui/autofill_and_password_manager_internals/autofill_internals_ui.h"
@@ -74,6 +75,9 @@ void RegisterChromeWebUIConfigs() {
map.AddWebUIConfig(std::make_unique<AutofillInternalsUIConfig>());
map.AddWebUIConfig(std::make_unique<BrowsingTopicsInternalsUIConfig>());
map.AddWebUIConfig(std::make_unique<ChromeURLsUIConfig>());
+#if BUILDFLAG(ENABLE_CEF)
+ map.AddWebUIConfig(std::make_unique<ChromeUILicenseConfig>());
+#endif
map.AddWebUIConfig(std::make_unique<ComponentsUIConfig>());
map.AddWebUIConfig(std::make_unique<CreditsUIConfig>());
map.AddWebUIConfig(std::make_unique<DataSharingInternalsUIConfig>());
Remove custom chrome scheme handling (see #3685) - Add CEF info to existing chrome://version WebUI. - Move chrome://license handling to WebUI. - Remove chrome://webui-hosts; use chrome://chrome-urls instead. - Remove chrome://extension-support; navigate to docs directly instead.
2024-07-03 19:07:46 +02:00
diff --git chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
Update to Chromium version 129.0.6668.0 - Mac: Minimum system version is now 11.0. - Win: Windows SDK version is now 10.0.22621.2428.
2024-08-26 14:44:25 +02:00
index af6d877f601d2..03c53be62e560 100644
Remove custom chrome scheme handling (see #3685) - Add CEF info to existing chrome://version WebUI. - Move chrome://license handling to WebUI. - Remove chrome://webui-hosts; use chrome://chrome-urls instead. - Remove chrome://extension-support; navigate to docs directly instead.
2024-07-03 19:07:46 +02:00
--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -18,6 +18,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/about_flags.h"
#include "chrome/browser/buildflags.h"
#include "chrome/browser/commerce/shopping_service_factory.h"
Update to Chromium version 129.0.6668.0 - Mac: Minimum system version is now 11.0. - Win: Windows SDK version is now 10.0.22621.2428.
2024-08-26 14:44:25 +02:00
@@ -980,6 +981,9 @@ ChromeWebUIControllerFactory::GetListOfAcceptableURLs() {
Remove custom chrome scheme handling (see #3685) - Add CEF info to existing chrome://version WebUI. - Move chrome://license handling to WebUI. - Remove chrome://webui-hosts; use chrome://chrome-urls instead. - Remove chrome://extension-support; navigate to docs directly instead.
2024-07-03 19:07:46 +02:00
GURL(chrome::kChromeUIGpuURL),
GURL(chrome::kChromeUIHistogramsURL),
GURL(chrome::kChromeUIInspectURL),
+#if BUILDFLAG(ENABLE_CEF)
+ GURL(chrome::kChromeUILicenseURL),
+#endif
GURL(chrome::kChromeUIManagementURL),
GURL(chrome::kChromeUINetExportURL),
GURL(chrome::kChromeUIPrefsInternalsURL),
diff --git chrome/common/webui_url_constants.cc chrome/common/webui_url_constants.cc
Update to Chromium version 128.0.6613.0 (#1331488)
2024-07-29 19:09:20 +02:00
index 248b6795e8cbe..c957f9d55613d 100644
Remove custom chrome scheme handling (see #3685) - Add CEF info to existing chrome://version WebUI. - Move chrome://license handling to WebUI. - Remove chrome://webui-hosts; use chrome://chrome-urls instead. - Remove chrome://extension-support; navigate to docs directly instead.
2024-07-03 19:07:46 +02:00
--- chrome/common/webui_url_constants.cc
+++ chrome/common/webui_url_constants.cc
Update to Chromium version 128.0.6613.0 (#1331488)
2024-07-29 19:09:20 +02:00
@@ -99,6 +99,9 @@ base::span<const base::cstring_view> ChromeURLHosts() {
kChromeUIHistoryHost,
history_clusters_internals::kChromeUIHistoryClustersInternalsHost,
kChromeUIInterstitialHost,
Remove custom chrome scheme handling (see #3685) - Add CEF info to existing chrome://version WebUI. - Move chrome://license handling to WebUI. - Remove chrome://webui-hosts; use chrome://chrome-urls instead. - Remove chrome://extension-support; navigate to docs directly instead.
2024-07-03 19:07:46 +02:00
+#if BUILDFLAG(ENABLE_CEF)
Update to Chromium version 128.0.6613.0 (#1331488)
2024-07-29 19:09:20 +02:00
+ kChromeUILicenseHost,
Remove custom chrome scheme handling (see #3685) - Add CEF info to existing chrome://version WebUI. - Move chrome://license handling to WebUI. - Remove chrome://webui-hosts; use chrome://chrome-urls instead. - Remove chrome://extension-support; navigate to docs directly instead.
2024-07-03 19:07:46 +02:00
+#endif
Update to Chromium version 128.0.6613.0 (#1331488)
2024-07-29 19:09:20 +02:00
kChromeUILocalStateHost,
Remove custom chrome scheme handling (see #3685) - Add CEF info to existing chrome://version WebUI. - Move chrome://license handling to WebUI. - Remove chrome://webui-hosts; use chrome://chrome-urls instead. - Remove chrome://extension-support; navigate to docs directly instead.
2024-07-03 19:07:46 +02:00
#if !BUILDFLAG(IS_ANDROID)
Update to Chromium version 128.0.6613.0 (#1331488)
2024-07-29 19:09:20 +02:00
kChromeUIManagementHost,
Remove custom chrome scheme handling (see #3685) - Add CEF info to existing chrome://version WebUI. - Move chrome://license handling to WebUI. - Remove chrome://webui-hosts; use chrome://chrome-urls instead. - Remove chrome://extension-support; navigate to docs directly instead.
2024-07-03 19:07:46 +02:00
diff --git chrome/common/webui_url_constants.h chrome/common/webui_url_constants.h
Update to Chromium version 129.0.6668.0 - Mac: Minimum system version is now 11.0. - Win: Windows SDK version is now 10.0.22621.2428.
2024-08-26 14:44:25 +02:00
index 52672e0274345..cdcaf3deb3c32 100644
Remove custom chrome scheme handling (see #3685) - Add CEF info to existing chrome://version WebUI. - Move chrome://license handling to WebUI. - Remove chrome://webui-hosts; use chrome://chrome-urls instead. - Remove chrome://extension-support; navigate to docs directly instead.
2024-07-03 19:07:46 +02:00
--- chrome/common/webui_url_constants.h
+++ chrome/common/webui_url_constants.h
Update to Chromium version 128.0.6613.0 (#1331488)
2024-07-29 19:09:20 +02:00
@@ -18,6 +18,7 @@
Remove custom chrome scheme handling (see #3685) - Add CEF info to existing chrome://version WebUI. - Move chrome://license handling to WebUI. - Remove chrome://webui-hosts; use chrome://chrome-urls instead. - Remove chrome://extension-support; navigate to docs directly instead.
2024-07-03 19:07:46 +02:00
#include "build/branding_buildflags.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
+#include "cef/libcef/features/features.h"
#include "chrome/common/buildflags.h"
#include "components/lens/buildflags.h"
#include "content/public/common/url_constants.h"
Update to Chromium version 128.0.6613.0 (#1331488)
2024-07-29 19:09:20 +02:00
@@ -155,6 +156,10 @@ inline constexpr char kChromeUILauncherInternalsURL[] =
inline constexpr char kChromeUILensSearchBubbleHost[] = "lens-search-bubble";
inline constexpr char kChromeUILensSearchBubbleURL[] =
"chrome://lens-search-bubble/";
Remove custom chrome scheme handling (see #3685) - Add CEF info to existing chrome://version WebUI. - Move chrome://license handling to WebUI. - Remove chrome://webui-hosts; use chrome://chrome-urls instead. - Remove chrome://extension-support; navigate to docs directly instead.
2024-07-03 19:07:46 +02:00
+#if BUILDFLAG(ENABLE_CEF)
Update to Chromium version 128.0.6613.0 (#1331488)
2024-07-29 19:09:20 +02:00
+inline constexpr char kChromeUILicenseHost[] = "license";
+inline constexpr char kChromeUILicenseURL[] = "chrome://license/";
Remove custom chrome scheme handling (see #3685) - Add CEF info to existing chrome://version WebUI. - Move chrome://license handling to WebUI. - Remove chrome://webui-hosts; use chrome://chrome-urls instead. - Remove chrome://extension-support; navigate to docs directly instead.
2024-07-03 19:07:46 +02:00
+#endif
Update to Chromium version 128.0.6613.0 (#1331488)
2024-07-29 19:09:20 +02:00
inline constexpr char kChromeUILocalStateHost[] = "local-state";
inline constexpr char kChromeUILocationInternalsHost[] = "location-internals";
inline constexpr char kChromeUIManagementHost[] = "management";