[cr133] kChromeUIWelcomeHost deleted
The welcome page is deleted from chromium, and with it, all the logic to prevent it from coming up has also to be removed from brave. Chromium changes: https://chromium.googlesource.com/chromium/src/+/a05c6dab32de24e9f305c0dd757e6495cfe54e7e commit a05c6dab32de24e9f305c0dd757e6495cfe54e7e Author: Nicolas Dossou-Gbete <dgn@chromium.org> Date: Wed Dec 4 11:18:14 2024 +0000 Remove chrome://welcome code Fixed: 338999420 Bug: 40253961
This commit is contained in:
@@ -1157,8 +1157,8 @@ bool BraveContentBrowserClient::HandleURLOverrideRewrite(
|
||||
#endif
|
||||
|
||||
// no special win10 welcome page
|
||||
if (url->host() == chrome::kChromeUIWelcomeHost) {
|
||||
*url = GURL(chrome::kChromeUIWelcomeURL);
|
||||
if (url->host() == kWelcomeHost) {
|
||||
*url = GURL(kWelcomeURL);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
#include "brave/components/brave_webtorrent/browser/buildflags/buildflags.h"
|
||||
#include "brave/components/constants/brave_paths.h"
|
||||
#include "brave/components/constants/pref_names.h"
|
||||
#include "brave/components/constants/webui_url_constants.h"
|
||||
#include "brave/components/tor/buildflags/buildflags.h"
|
||||
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
|
||||
#include "chrome/browser/extensions/component_loader.h"
|
||||
@@ -152,7 +153,7 @@ class BraveContentBrowserClientTest : public InProcessBrowserTest {
|
||||
|
||||
IN_PROC_BROWSER_TEST_F(BraveContentBrowserClientTest, CanLoadChromeURL) {
|
||||
std::vector<std::string> pages{
|
||||
chrome::kChromeUIWelcomeHost,
|
||||
kWelcomeHost,
|
||||
};
|
||||
|
||||
std::vector<std::string> schemes{
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
#include "brave/browser/ui/startup/brave_startup_tab_provider_impl.h"
|
||||
|
||||
#include "brave/components/constants/webui_url_constants.h"
|
||||
#include "chrome/browser/first_run/first_run.h"
|
||||
#include "chrome/browser/ui/startup/startup_tab.h"
|
||||
#include "chrome/common/webui_url_constants.h"
|
||||
|
||||
StartupTabs BraveStartupTabProviderImpl::GetDistributionFirstRunTabs(
|
||||
StartupBrowserCreator* browser_creator) const {
|
||||
StartupTabs tabs =
|
||||
StartupTabProviderImpl::GetDistributionFirstRunTabs(browser_creator);
|
||||
if (first_run::IsChromeFirstRun()) {
|
||||
tabs.emplace_back(GURL(chrome::kChromeUIWelcomeURL));
|
||||
tabs.emplace_back(GURL(kWelcomeURL));
|
||||
}
|
||||
return tabs;
|
||||
}
|
||||
|
||||
@@ -201,8 +201,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
|
||||
// in WebUI.
|
||||
url.host_piece() == chrome::kChromeUINewTabHost ||
|
||||
url.host_piece() == chrome::kChromeUISettingsHost ||
|
||||
((url.host_piece() == kWelcomeHost ||
|
||||
url.host_piece() == chrome::kChromeUIWelcomeURL) &&
|
||||
((url.host_piece() == kWelcomeHost || url.host_piece() == kWelcomeURL) &&
|
||||
!profile->IsGuestSession()) ||
|
||||
#endif // BUILDFLAG(IS_ANDROID)
|
||||
#if BUILDFLAG(ENABLE_TOR)
|
||||
|
||||
@@ -23,6 +23,7 @@ inline constexpr char kRewardsPageTopHost[] = "rewards.top-chrome";
|
||||
inline constexpr char kRewardsPageTopURL[] = "chrome://rewards.top-chrome";
|
||||
inline constexpr char kRewardsInternalsHost[] = "rewards-internals";
|
||||
inline constexpr char kWelcomeHost[] = "welcome";
|
||||
inline constexpr char kWelcomeURL[] = "chrome://welcome/";
|
||||
inline constexpr char kWelcomeJS[] = "brave_welcome.js";
|
||||
inline constexpr char kBraveRewardsPanelURL[] =
|
||||
"chrome://rewards-panel.top-chrome";
|
||||
|
||||
@@ -51,9 +51,6 @@
|
||||
# These tests fail upstream when DCHECKs are enabled.
|
||||
-PenIdBrowserTest.*
|
||||
|
||||
# This test is disabled because we override the default handling of the welcome page
|
||||
-StartupBrowserCreatorTriggeredResetFirstRunTest.TestTriggeredResetDoesNotShowWithFirstRunURLs
|
||||
|
||||
-All/MediaEngagementAutoplayBrowserTest.*
|
||||
-All/ExternallyManagedBrowserTestWithPrefMigrationRead.ReinstallPolicyAppWithLocallyInstalledApp/1
|
||||
-All/PDFPluginDisabledTest.*
|
||||
|
||||
@@ -684,10 +684,6 @@
|
||||
# This test fails because our badge doesn't match the upstream badge
|
||||
-IconBadgingTest.VerifyFromDisk
|
||||
|
||||
# This test fails because it no longer modifies its expectations now that the
|
||||
# kForYouFre feature flag was removed
|
||||
-StartupBrowserCreatorImplTest.DetermineStartupTabs_NewFeaturesPage
|
||||
|
||||
# These tests fail because we stub signin::ShouldShowSyncPromo to always return
|
||||
# false
|
||||
-ShowSyncPromoTest.*
|
||||
|
||||
Reference in New Issue
Block a user