Skip to content

Commit 06d0ced

Browse files
committed
Re-enabled default browser infobar
fix brave/brave-browser#25929
1 parent 5fdf9f2 commit 06d0ced

13 files changed

+16
-537
lines changed

app/brave_generated_resources.grd

-19
Original file line numberDiff line numberDiff line change
@@ -485,25 +485,6 @@ Or change later at <ph name="SETTINGS_EXTENIONS_LINK">$2<ex>brave://settings/ext
485485
</message>
486486
</if>
487487

488-
<!-- Brave default browser dialog -->
489-
<if expr="not is_android">
490-
<message name="IDS_BRAVE_DEFAULT_BROWSER_DIALOG_HEADER_TEXT" desc="The header text for default browser dialog">
491-
Set Brave as your default browser
492-
</message>
493-
<message name="IDS_BRAVE_DEFAULT_BROWSER_DIALOG_CONTENTS_TEXT" desc="The contents for default browser dialog">
494-
Keep browsing the web faster - up to 6x faster on major news sites.
495-
</message>
496-
<message name="IDS_BRAVE_DEFAULT_BROWSER_DIALOG_DONT_ASK" desc="The text for disabling default browser dialog checkbox">
497-
Don't ask again
498-
</message>
499-
<message name="IDS_BRAVE_DEFAULT_BROWSER_DIALOG_OK_BUTTON_LABEL" desc="The text for default browser dialog ok button">
500-
Set as default
501-
</message>
502-
<message name="IDS_BRAVE_DEFAULT_BROWSER_DIALOG_CANCEL_BUTTON_LABEL" desc="The text for default browser dialog cancel button">
503-
Not now
504-
</message>
505-
</if>
506-
507488
<!-- Web Discovery dialog -->
508489
<if expr="not is_android">
509490
<message name="IDS_WEB_DISCOVERY_DIALOG_HEADER_TEXT" desc="The text for web discovery dialog header">

browser/brave_local_state_prefs.cc

+5-2
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@ void RegisterLocalStatePrefsForMigration(PrefRegistrySimple* registry) {
5959
#if BUILDFLAG(ENABLE_WIDEVINE)
6060
RegisterWidevineLocalstatePrefsForMigration(registry);
6161
#endif
62+
63+
#if !BUILDFLAG(IS_ANDROID)
64+
// Added 10/2022
65+
registry->RegisterBooleanPref(kDefaultBrowserPromptEnabled, true);
66+
#endif
6267
}
6368

6469
void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
@@ -100,8 +105,6 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
100105
BraveWindowTracker::RegisterPrefs(registry);
101106
BraveUptimeTracker::RegisterPrefs(registry);
102107
dark_mode::RegisterBraveDarkModeLocalStatePrefs(registry);
103-
104-
registry->RegisterBooleanPref(kDefaultBrowserPromptEnabled, true);
105108
#endif
106109

107110
#if BUILDFLAG(ENABLE_CRASH_DIALOG)

browser/brave_prefs_browsertest.cc

-5
Original file line numberDiff line numberDiff line change
@@ -188,11 +188,6 @@ IN_PROC_BROWSER_TEST_F(BraveProfilePrefsBrowserTest, MediaRouterPrefTest) {
188188
}
189189

190190
IN_PROC_BROWSER_TEST_F(BraveLocalStatePrefsBrowserTest, DefaultLocalStateTest) {
191-
#if !BUILDFLAG(IS_ANDROID)
192-
EXPECT_TRUE(g_browser_process->local_state()->GetBoolean(
193-
kDefaultBrowserPromptEnabled));
194-
#endif
195-
196191
#if BUILDFLAG(ENABLE_CRASH_DIALOG)
197192
EXPECT_FALSE(
198193
g_browser_process->local_state()->GetBoolean(kDontAskForCrashReporting));

browser/brave_profile_prefs.cc

+3-2
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@
128128

129129
#if !BUILDFLAG(IS_ANDROID)
130130
#include "brave/browser/search_engines/search_engine_provider_util.h"
131-
#include "brave/browser/ui/startup/default_brave_browser_prompt.h"
132131
#include "brave/browser/ui/tabs/brave_tab_prefs.h"
133132
#include "brave/components/brave_private_new_tab_ui/common/pref_names.h"
134133
#endif
@@ -164,6 +163,9 @@ void RegisterProfilePrefsForMigration(
164163

165164
// Added 06/2022
166165
brave::RegisterSearchEngineProviderPrefsForMigration(registry);
166+
167+
// Added 10/2022
168+
registry->RegisterIntegerPref(kDefaultBrowserLaunchingCount, 0);
167169
#endif
168170
brave_wallet::RegisterProfilePrefsForMigration(registry);
169171

@@ -440,7 +442,6 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
440442
base::Value(true));
441443
registry->RegisterBooleanPref(kEnableWindowClosingConfirm, true);
442444
registry->RegisterBooleanPref(kEnableClosingLastTab, true);
443-
RegisterDefaultBraveBrowserPromptPrefs(registry);
444445

445446
brave_tabs::RegisterBraveProfilePrefs(registry);
446447
#endif

browser/ui/BUILD.gn

-4
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,6 @@ source_set("ui") {
9595
"omnibox/brave_omnibox_client_impl.cc",
9696
"omnibox/brave_omnibox_client_impl.h",
9797
"session_crashed_bubble_brave.cc",
98-
"startup/default_brave_browser_prompt.cc",
99-
"startup/default_brave_browser_prompt.h",
10098
"toolbar/brave_app_menu_model.cc",
10199
"toolbar/brave_app_menu_model.h",
102100
"toolbar/brave_recent_tabs_sub_menu_model.h",
@@ -195,8 +193,6 @@ source_set("ui") {
195193
sources += [
196194
"views/bookmarks/bookmark_bar_instructions_view.cc",
197195
"views/bookmarks/bookmark_bar_instructions_view.h",
198-
"views/brave_default_browser_dialog_view.cc",
199-
"views/brave_default_browser_dialog_view.h",
200196
"views/brave_first_run_dialog.cc",
201197
"views/brave_first_run_dialog.h",
202198
"views/brave_layout_provider.cc",

browser/ui/browser_dialogs.h

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ class WebContents;
1414

1515
namespace brave {
1616

17-
void ShowDefaultBrowserDialog(Browser* browser);
1817
// Tab restore dialog will be launched after ask dialog is closed.
1918
void ShowCrashReportPermissionAskDialog(Browser* browser);
2019
void ShowWebDiscoveryDialog(Browser* browser, content::WebContents* contents);

browser/ui/startup/default_brave_browser_prompt.cc

-179
This file was deleted.

browser/ui/startup/default_brave_browser_prompt.h

-18
This file was deleted.

0 commit comments

Comments
 (0)