Merge pull request brave#23381 from brave/sko/wdp-all

Show 'Help WDP' in welcome ui for all countries
jagadeshjai · May 4, 2024 · 5f0cd47 · 5f0cd47
2 parents 8d76453 + b738879
commit 5f0cd47
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 29 deletions.
diff --git a/browser/about_flags.cc b/browser/about_flags.cc
@@ -478,15 +478,6 @@
                    FEATURE_VALUE_TYPE(brave_player::features::kBravePlayer), \
                }))
 
-#define BRAVE_WELCOME_PAGE_FEATURE_ENTRIES                          \
-  EXPAND_FEATURE_ENTRIES({                                          \
-      "brave-show-help-wdp-in-welcome-page",                        \
-      "Show Help WDP in Welcome Page",                              \
-      "Show Help WDP in Welcome Page regardless of country code",   \
-      kOsWin | kOsLinux | kOsMac,                                   \
-      FEATURE_VALUE_TYPE(features::kBraveShowHelpWDPInWelcomePage), \
-  })
-
 // Keep the last item empty.
 #define LAST_BRAVE_FEATURE_ENTRIES_ITEM
 
@@ -1019,7 +1010,6 @@
   BRAVE_OMNIBOX_FEATURES                                                       \
   BRAVE_PLAYER_FEATURE_ENTRIES                                                 \
   BRAVE_MIDDLE_CLICK_AUTOSCROLL_FEATURE_ENTRY                                  \
-  BRAVE_WELCOME_PAGE_FEATURE_ENTRIES                                           \
   LAST_BRAVE_FEATURE_ENTRIES_ITEM  // Keep it as the last item.
 namespace flags_ui {
 namespace {

diff --git a/browser/brave_browser_features.cc b/browser/brave_browser_features.cc
@@ -48,10 +48,4 @@ const base::FeatureParam<std::string> kBraveDayZeroExperimentVariant{
     /*name=*/"variant",
     /*default_value=*/""};
 
-// Shows "Help WDP" in brave://welcome page. If this is off,
-// the page shows up only when country code is Japan
-BASE_FEATURE(kBraveShowHelpWDPInWelcomePage,
-             "brave-show-help-wdp-in-welcome-page",
-             base::FEATURE_DISABLED_BY_DEFAULT);
-
 }  // namespace features
diff --git a/browser/brave_browser_features.h b/browser/brave_browser_features.h
@@ -21,8 +21,6 @@ BASE_DECLARE_FEATURE(kBraveWebViewRoundedCorners);
 BASE_DECLARE_FEATURE(kBraveDayZeroExperiment);
 extern const base::FeatureParam<std::string> kBraveDayZeroExperimentVariant;
 
-BASE_DECLARE_FEATURE(kBraveShowHelpWDPInWelcomePage);
-
 }  // namespace features
 
 #endif  // BRAVE_BROWSER_BRAVE_BROWSER_FEATURES_H_
diff --git a/browser/ui/webui/welcome_page/brave_welcome_ui.cc b/browser/ui/webui/welcome_page/brave_welcome_ui.cc
@@ -164,11 +164,6 @@ BraveWelcomeUI::BraveWelcomeUI(content::WebUI* web_ui, const std::string& name)
       "hardwareAccelerationEnabledAtStartup",
       content::GpuDataManager::GetInstance()->HardwareAccelerationEnabled());
 
-  source->AddBoolean(
-      /*name*/ "showHelpWDP",
-      /*value*/ is_jpn || base::FeatureList::IsEnabled(
-                              features::kBraveShowHelpWDPInWelcomePage));
-
   profile->GetPrefs()->SetBoolean(prefs::kHasSeenWelcomePage, true);
 
   AddBackgroundColorToSource(source, web_ui->GetWebContents());

diff --git a/components/brave_welcome_ui/state/hooks.ts b/components/brave_welcome_ui/state/hooks.ts
@@ -78,8 +78,6 @@ interface ViewTypeState {
   fail?: ViewType;
 }
 
-const showHelpWDP = loadTimeData.getBoolean('showHelpWDP')
-
 export function useViewTypeTransition(currentViewType: ViewType | undefined) : ViewTypeState {
   const { browserProfiles, currentSelectedBrowserProfiles} = React.useContext(DataContext)
 
@@ -90,11 +88,11 @@ export function useViewTypeTransition(currentViewType: ViewType | undefined) : V
             ViewType.ImportSelectTheme : ViewType.ImportSelectBrowser
       },
       [ViewType.ImportSelectTheme]: {
-        forward: showHelpWDP ? ViewType.HelpWDP : ViewType.HelpImprove
+        forward: ViewType.HelpWDP
       },
       [ViewType.ImportSelectBrowser]: {
         forward: currentSelectedBrowserProfiles && currentSelectedBrowserProfiles.length > 1 ? ViewType.ImportSelectProfile : ViewType.ImportInProgress,
-        skip: showHelpWDP ? ViewType.HelpWDP : ViewType.HelpImprove,
+        skip: ViewType.HelpWDP,
       },
       [ViewType.ImportSelectProfile]: {
         forward: ViewType.ImportInProgress,
@@ -105,10 +103,10 @@ export function useViewTypeTransition(currentViewType: ViewType | undefined) : V
         fail: ViewType.ImportFailed,
       },
       [ViewType.ImportSucceeded]: {
-        forward: showHelpWDP ? ViewType.HelpWDP : ViewType.HelpImprove
+        forward: ViewType.HelpWDP
       },
       [ViewType.ImportFailed]: {
-        forward: showHelpWDP ? ViewType.HelpWDP : ViewType.HelpImprove
+        forward: ViewType.HelpWDP
       },
       [ViewType.HelpWDP]: {
         forward: ViewType.HelpImprove