Merge pull request #10093 from brave/add_dont_ask_checkbox_to_crash_r…

…eport_permission_ask_dialog Added don't ask checkbox to crash report permission ask dialog
brave · Sep 15, 2021 · 2fbc667 · 2fbc667
2 parents 791f320 + 25f4916
commit 2fbc667
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 9 deletions.
diff --git a/app/brave_generated_resources.grd b/app/brave_generated_resources.grd
@@ -1167,6 +1167,9 @@ By installing this extension, you are agreeing to the Google Widevine Terms of U
         <message name="IDS_CRASH_REPORT_PERMISSION_ASK_DIALOG_CANCEL_BUTTON_LABEL" desc="The text for cancel button">
           Block
         </message>
+        <message name="IDS_CRASH_REPORT_PERMISSION_ASK_DIALOG_DONT_ASK_TEXT" desc="The text for disabling dialog checkbox">
+          Don't ask again
+        </message>
         <message name="IDS_CRASH_REPORT_PERMISSION_ASK_DIALOG_CONTENT_TEXT" desc="The contents for crash report ask dialog">
           Send crash reports automatically so Brave can prevent this issue from happening again?
         </message>

diff --git a/browser/brave_local_state_prefs.cc b/browser/brave_local_state_prefs.cc
@@ -7,6 +7,7 @@
 
 #include "base/values.h"
 #include "brave/browser/brave_stats/brave_stats_updater.h"
+#include "brave/browser/metrics/buildflags/buildflags.h"
 #include "brave/browser/metrics/metrics_reporting_util.h"
 #include "brave/browser/themes/brave_dark_mode_utils.h"
 #include "brave/common/pref_names.h"
@@ -100,6 +101,10 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(kDefaultBrowserPromptEnabled, true);
 #endif
 
+#if BUILDFLAG(ENABLE_CRASH_DIALOG)
+  registry->RegisterBooleanPref(kDontAskForCrashReporting, false);
+#endif
+
 #if BUILDFLAG(ENABLE_WIDEVINE)
   RegisterWidevineLocalstatePrefs(registry);
 #endif

diff --git a/browser/brave_prefs_browsertest.cc b/browser/brave_prefs_browsertest.cc
@@ -4,6 +4,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "brave/browser/ethereum_remote_client/buildflags/buildflags.h"
+#include "brave/browser/metrics/buildflags/buildflags.h"
 #include "brave/common/pref_names.h"
 #include "brave/components/brave_rewards/common/pref_names.h"
 #include "brave/components/brave_shields/common/pref_names.h"
@@ -158,9 +159,14 @@ IN_PROC_BROWSER_TEST_F(BraveProfilePrefsBrowserTest,
       prefs::kHideWebStoreIcon));
 }
 
-#if !defined(OS_ANDROID)
 IN_PROC_BROWSER_TEST_F(BraveLocalStatePrefsBrowserTest, DefaultLocalStateTest) {
+#if !defined(OS_ANDROID)
   EXPECT_TRUE(g_browser_process->local_state()->GetBoolean(
       kDefaultBrowserPromptEnabled));
-}
 #endif
+
+#if BUILDFLAG(ENABLE_CRASH_DIALOG)
+  EXPECT_FALSE(
+      g_browser_process->local_state()->GetBoolean(kDontAskForCrashReporting));
+#endif
+}
diff --git a/browser/metrics/buildflags/buildflags.gni b/browser/metrics/buildflags/buildflags.gni
@@ -4,5 +4,5 @@
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 declare_args() {
-  enable_crash_dialog = is_official_build
+  enable_crash_dialog = !is_android && is_official_build
 }
diff --git a/browser/metrics/metrics_reporting_util.cc b/browser/metrics/metrics_reporting_util.cc
@@ -9,8 +9,11 @@
 #include "base/notreached.h"
 #include "brave/browser/metrics/brave_metrics_service_accessor.h"
 #include "brave/browser/metrics/buildflags/buildflags.h"
+#include "brave/common/pref_names.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/metrics_reporting_state.h"
 #include "chrome/common/channel_info.h"
+#include "components/prefs/pref_service.h"
 #include "components/version_info/channel.h"
 
 bool GetDefaultPrefValueForMetricsReporting() {
@@ -30,9 +33,10 @@ bool GetDefaultPrefValueForMetricsReporting() {
 }
 
 bool ShouldShowCrashReportPermissionAskDialog() {
-#if !BUILDFLAG(ENABLE_CRASH_DIALOG)
-  return false;
-#endif
+#if BUILDFLAG(ENABLE_CRASH_DIALOG)
+  PrefService* local_prefs = g_browser_process->local_state();
+  if (local_prefs->GetBoolean(kDontAskForCrashReporting))
+    return false;
 
   if (IsMetricsReportingPolicyManaged())
     return false;
@@ -41,4 +45,7 @@ bool ShouldShowCrashReportPermissionAskDialog() {
     return false;
 
   return true;
+#else
+  return false;
+#endif
 }
diff --git a/browser/ui/views/crash_report_permission_ask_dialog_view.cc b/browser/ui/views/crash_report_permission_ask_dialog_view.cc
@@ -11,6 +11,7 @@
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "brave/app/vector_icons/vector_icons.h"
 #include "brave/browser/themes/theme_properties.h"
+#include "brave/common/pref_names.h"
 #include "brave/grit/brave_generated_resources.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/metrics_reporting_state.h"
@@ -22,10 +23,12 @@
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/common/webui_url_constants.h"
 #include "components/constrained_window/constrained_window_views.h"
+#include "components/prefs/pref_service.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/image_model.h"
 #include "ui/base/theme_provider.h"
 #include "ui/views/background.h"
+#include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/styled_label.h"
@@ -150,11 +153,11 @@ void CrashReportPermissionAskDialogView::CreateChildViews(
   if (offset != 0)
     header_label->AddStyleRange(gfx::Range(0, offset), default_style);
 
-  // Construct contents text area
+  // Construct contents area that includes main text and checkbox.
   auto* contents = AddChildView(std::make_unique<views::View>());
   contents->SetLayoutManager(std::make_unique<views::BoxLayout>(
-      views::BoxLayout::Orientation::kHorizontal,
-      gfx::Insets{0, kPadding + kChildSpacing, 0, 0}));
+      views::BoxLayout::Orientation::kVertical,
+      gfx::Insets{0, kPadding + kChildSpacing, 0, 0}, 5));
   constexpr int kContentsTextFontSize = 13;
   auto* contents_label = contents->AddChildView(std::make_unique<views::Label>(
       l10n_util::GetStringUTF16(
@@ -165,6 +168,9 @@ void CrashReportPermissionAskDialogView::CreateChildViews(
   contents_label->SetMultiLine(true);
   constexpr int kContentsLabelMaxWidth = 350;
   contents_label->SetMaximumWidth(kContentsLabelMaxWidth);
+  dont_ask_again_checkbox_ = contents->AddChildView(
+      std::make_unique<views::Checkbox>(l10n_util::GetStringUTF16(
+          IDS_CRASH_REPORT_PERMISSION_ASK_DIALOG_DONT_ASK_TEXT)));
 
   // Construct footnote text area
   constexpr int kFootnoteVerticalPadding = 16;
@@ -231,6 +237,9 @@ void CrashReportPermissionAskDialogView::OnAcceptButtonClicked() {
 }
 
 void CrashReportPermissionAskDialogView::OnWindowClosing() {
+  g_browser_process->local_state()->SetBoolean(
+      kDontAskForCrashReporting, dont_ask_again_checkbox_->GetChecked());
+
   // On macOS, this dialog is not destroyed properly when session crashed bubble
   // is launched directly.
   base::SequencedTaskRunnerHandle::Get()->PostTask(

diff --git a/browser/ui/views/crash_report_permission_ask_dialog_view.h b/browser/ui/views/crash_report_permission_ask_dialog_view.h
@@ -12,6 +12,10 @@
 
 class Browser;
 
+namespace views {
+class Checkbox;
+}  // namespace views
+
 class CrashReportPermissionAskDialogView : public views::DialogDelegateView {
  public:
   static void Show(Browser* browser);
@@ -34,6 +38,8 @@ class CrashReportPermissionAskDialogView : public views::DialogDelegateView {
   void OnAcceptButtonClicked();
   void OnWindowClosing();
   void CreateChildViews(views::Widget* parent);
+
+  views::Checkbox* dont_ask_again_checkbox_ = nullptr;
 };
 
 #endif  // BRAVE_BROWSER_UI_VIEWS_CRASH_REPORT_PERMISSION_ASK_DIALOG_VIEW_H_
diff --git a/common/pref_names.cc b/common/pref_names.cc
@@ -94,6 +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 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
@@ -91,6 +91,7 @@ extern const char kSafetynetStatus[];
 
 extern const char kDefaultBrowserLaunchingCount[];
 extern const char kTabsSearchShow[];
+extern const char kDontAskForCrashReporting[];
 
 #if BUILDFLAG(ENABLE_BRAVE_VPN)
 extern const char kBraveVPNShowButton[];

diff --git a/test/BUILD.gn b/test/BUILD.gn
@@ -709,6 +709,7 @@ if (!is_android) {
       "//brave/browser/brave_wallet:tab_helper",
       "//brave/browser/browsing_data:browser_tests",
       "//brave/browser/farbling:browser_tests",
+      "//brave/browser/metrics/buildflags",
       "//brave/browser/permissions:browser_tests",
       "//brave/browser/tor:browser_tests",
       "//brave/browser/ui:browser_tests",
@@ -971,6 +972,7 @@ if (!is_android) {
       "//brave/app/theme:brave_unscaled_resources_grit",
       "//brave/browser/brave_ads",
       "//brave/browser/ethereum_remote_client/buildflags",
+      "//brave/browser/metrics/buildflags",
       "//brave/browser/net",
       "//brave/browser/themes",
       "//brave/common:pref_names",