From 4a75322a08ed00aa57ec226c6e42869c88a007bb Mon Sep 17 00:00:00 2001 From: Simon Hong Date: Wed, 15 Sep 2021 10:42:54 +0900 Subject: [PATCH] Changed prefs to kDontAskForCrashReporting to prevent double negative --- browser/brave_local_state_prefs.cc | 2 +- browser/brave_prefs_browsertest.cc | 4 ++-- browser/metrics/metrics_reporting_util.cc | 2 +- browser/ui/views/crash_report_permission_ask_dialog_view.cc | 2 +- common/pref_names.cc | 2 +- common/pref_names.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/browser/brave_local_state_prefs.cc b/browser/brave_local_state_prefs.cc index 97f90f83361..718f9ccb649 100644 --- a/browser/brave_local_state_prefs.cc +++ b/browser/brave_local_state_prefs.cc @@ -98,7 +98,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { dark_mode::RegisterBraveDarkModeLocalStatePrefs(registry); registry->RegisterBooleanPref(kDefaultBrowserPromptEnabled, true); - registry->RegisterBooleanPref(kAskCrashReportPermission, true); + registry->RegisterBooleanPref(kDontAskForCrashReporting, false); #endif #if BUILDFLAG(ENABLE_WIDEVINE) diff --git a/browser/brave_prefs_browsertest.cc b/browser/brave_prefs_browsertest.cc index 07db3c57bc4..f7375962eb8 100644 --- a/browser/brave_prefs_browsertest.cc +++ b/browser/brave_prefs_browsertest.cc @@ -162,7 +162,7 @@ IN_PROC_BROWSER_TEST_F(BraveProfilePrefsBrowserTest, IN_PROC_BROWSER_TEST_F(BraveLocalStatePrefsBrowserTest, DefaultLocalStateTest) { EXPECT_TRUE(g_browser_process->local_state()->GetBoolean( kDefaultBrowserPromptEnabled)); - EXPECT_TRUE( - g_browser_process->local_state()->GetBoolean(kAskCrashReportPermission)); + EXPECT_FALSE( + g_browser_process->local_state()->GetBoolean(kDontAskForCrashReporting)); } #endif diff --git a/browser/metrics/metrics_reporting_util.cc b/browser/metrics/metrics_reporting_util.cc index b73de98e8e7..b815ef4010d 100644 --- a/browser/metrics/metrics_reporting_util.cc +++ b/browser/metrics/metrics_reporting_util.cc @@ -38,7 +38,7 @@ bool ShouldShowCrashReportPermissionAskDialog() { #endif PrefService* local_prefs = g_browser_process->local_state(); - if (!local_prefs->GetBoolean(kAskCrashReportPermission)) + if (local_prefs->GetBoolean(kDontAskForCrashReporting)) return false; if (IsMetricsReportingPolicyManaged()) diff --git a/browser/ui/views/crash_report_permission_ask_dialog_view.cc b/browser/ui/views/crash_report_permission_ask_dialog_view.cc index 507d714e2ea..57ae481e0ad 100644 --- a/browser/ui/views/crash_report_permission_ask_dialog_view.cc +++ b/browser/ui/views/crash_report_permission_ask_dialog_view.cc @@ -238,7 +238,7 @@ void CrashReportPermissionAskDialogView::OnAcceptButtonClicked() { void CrashReportPermissionAskDialogView::OnWindowClosing() { g_browser_process->local_state()->SetBoolean( - kAskCrashReportPermission, !dont_ask_again_checkbox_->GetChecked()); + kDontAskForCrashReporting, dont_ask_again_checkbox_->GetChecked()); // On macOS, this dialog is not destroyed properly when session crashed bubble // is launched directly. diff --git a/common/pref_names.cc b/common/pref_names.cc index f6210f15968..2d8aa9b2e73 100644 --- a/common/pref_names.cc +++ b/common/pref_names.cc @@ -94,7 +94,7 @@ const char kImportDialogExtensions[] = "import_dialog_extensions"; const char kImportDialogPayments[] = "import_dialog_payments"; const char kMRUCyclingEnabled[] = "brave.mru_cycling_enabled"; const char kTabsSearchShow[] = "brave.tabs_search_show"; -const char kAskCrashReportPermission[] = "brave.ask_crash_report_permission"; +const char kDontAskForCrashReporting[] = "brave.dont_ask_for_crash_reporting"; #if BUILDFLAG(ENABLE_BRAVE_VPN) const char kBraveVPNShowButton[] = "brave.brave_vpn.show_button"; diff --git a/common/pref_names.h b/common/pref_names.h index 720552766a9..01eb3fccbc0 100644 --- a/common/pref_names.h +++ b/common/pref_names.h @@ -91,7 +91,7 @@ extern const char kSafetynetStatus[]; extern const char kDefaultBrowserLaunchingCount[]; extern const char kTabsSearchShow[]; -extern const char kAskCrashReportPermission[]; +extern const char kDontAskForCrashReporting[]; #if BUILDFLAG(ENABLE_BRAVE_VPN) extern const char kBraveVPNShowButton[];