From 447d509d112ce175d6966d72275f90d74c166481 Mon Sep 17 00:00:00 2001
From: Max <41635752+mkarolin@users.noreply.github.com>
Date: Wed, 30 Sep 2020 15:07:59 -0400
Subject: [PATCH] Merge pull request #6699 from
 brave/maxk-fix-safe-browsing-text

Modifies certain Safety Check and Safe Browsing strings.
---
 app/brave_generated_resources.grd                  | 11 +++++++++++
 .../ui/webui/settings/safety_check_handler.cc      | 14 ++++++++++++++
 .../settings_localized_strings_provider.cc         |  7 +++++++
 3 files changed, 32 insertions(+)
 create mode 100644 chromium_src/chrome/browser/ui/webui/settings/safety_check_handler.cc

diff --git a/app/brave_generated_resources.grd b/app/brave_generated_resources.grd
index 5f2a3acc03e3..bbe74f7807f4 100644
--- a/app/brave_generated_resources.grd
+++ b/app/brave_generated_resources.grd
@@ -261,6 +261,17 @@ By installing this extension, you are agreeing to the Google Widevine Terms of U
       <message name="IDS_SETTINGS_APPEARANCE_SETTINGS_USE_AUTOCOMPLETE_BRAVE_SUGGESTED_SITES" desc="The label for settings switch controlling whether or not Brave suggested sites show up in autocomplete">
         Show Brave suggested sites in autocomplete suggestions
       </message>
+      <!-- Settings / Safety Check -->
+      <message name="IDS_SETTINGS_BRAVE_SAFETY_CHECK_SAFE_BROWSING_ENABLED_STANDARD_AVAILABLE_ENHANCED" desc="This text points out that Safe Browsing is enabled as standard protection.">
+        Standard protection is on.
+      </message>
+      <!-- Settings / Safe Browsing -->
+      <message name="IDS_SETTINGS_BRAVE_SAFEBROWSING_STANDARD_BULLET_TWO" desc="Second bullet point under the safe browsing standard protection mode">
+        Checks URLs with a list of unsafe sites stored in Brave.
+      </message>
+      <message name="IDS_SETTINGS_BRAVE_SAFEBROWSING_NONE_DESC" desc="Description for safe browsing no protection mode">
+        Does not protect you against dangerous websites, downloads, and extensions.
+      </message>
       <!-- New Tab Page -->
       <message name="IDS_SETTINGS_NEW_TAB" desc="The text label for the New Tab settings page">
        New Tab Page
diff --git a/chromium_src/chrome/browser/ui/webui/settings/safety_check_handler.cc b/chromium_src/chrome/browser/ui/webui/settings/safety_check_handler.cc
new file mode 100644
index 000000000000..a243fd7e9224
--- /dev/null
+++ b/chromium_src/chrome/browser/ui/webui/settings/safety_check_handler.cc
@@ -0,0 +1,14 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "brave/grit/brave_generated_resources.h"
+#include "chrome/grit/generated_resources.h"
+
+#undef IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_ENABLED_STANDARD_AVAILABLE_ENHANCED  // NOLINT
+// NOLINTNEXTLINE
+#define IDS_SETTINGS_SAFETY_CHECK_SAFE_BROWSING_ENABLED_STANDARD_AVAILABLE_ENHANCED \
+  IDS_SETTINGS_BRAVE_SAFETY_CHECK_SAFE_BROWSING_ENABLED_STANDARD_AVAILABLE_ENHANCED  // NOLINT
+
+#include "../../../../../../../chrome/browser/ui/webui/settings/safety_check_handler.cc"
diff --git a/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
index 72cfeb6aeb86..7fba7bf118df 100644
--- a/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -28,6 +28,13 @@ void BraveAddLocalizedStrings(content::WebUIDataSource*, Profile*);
 #define IDS_SETTINGS_EDIT_PERSON IDS_SETTINGS_BRAVE_EDIT_PROFILE
 #undef IDS_SETTINGS_PROFILE_NAME_AND_PICTURE
 #define IDS_SETTINGS_PROFILE_NAME_AND_PICTURE IDS_SETTINGS_BRAVE_EDIT_PROFILE
+#undef IDS_SETTINGS_SAFEBROWSING_STANDARD_BULLET_TWO
+#define IDS_SETTINGS_SAFEBROWSING_STANDARD_BULLET_TWO \
+  IDS_SETTINGS_BRAVE_SAFEBROWSING_STANDARD_BULLET_TWO
+#undef IDS_SETTINGS_SAFEBROWSING_NONE_DESC
+#define IDS_SETTINGS_SAFEBROWSING_NONE_DESC \
+  IDS_SETTINGS_BRAVE_SAFEBROWSING_NONE_DESC
+
 #define GetVersionNumber GetBraveVersionNumberForDisplay
 
 #include "../../../../../../../chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc"