Merge pull request #244 from brave/disable_google_services

Disable google services in privacy settings
brave · Jul 11, 2018 · f27b72f · f27b72f
2 parents 7cd5d53 + e987c6f
commit f27b72f
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 0 deletions.
diff --git a/browser/BUILD.gn b/browser/BUILD.gn
@@ -51,6 +51,8 @@ source_set("browser_process") {
     "//brave/components/content_settings/core/browser",
     "//brave/common",
     "//components/component_updater",
+    "//components/safe_browsing/common:safe_browsing_prefs",
+    "//components/spellcheck/browser",
     "//content/public/browser",
     "//brave/chromium_src:browser",
   ]

diff --git a/browser/brave_profile_prefs.cc b/browser/brave_profile_prefs.cc
@@ -10,7 +10,9 @@
 #include "chrome/common/pref_names.h"
 #include "components/content_settings/core/common/pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
+#include "components/safe_browsing/common/safe_browsing_prefs.h"
 #include "components/signin/core/browser/signin_pref_names.h"
+#include "components/spellcheck/browser/pref_names.h"
 
 namespace brave {
 
@@ -28,6 +30,18 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
 
   // Show download prompt by default
   registry->SetDefaultPrefValue(prefs::kPromptForDownload, base::Value(true));
+
+  // Not using chrome's web service for resolving navigation errors
+  registry->SetDefaultPrefValue(prefs::kAlternateErrorPagesEnabled, base::Value(false));
+
+  // Disable spell check service
+  registry->SetDefaultPrefValue(spellcheck::prefs::kSpellCheckUseSpellingService, base::Value(false));
+
+  // Disable safebrowsing reporting
+  registry->SetDefaultPrefValue(prefs::kSafeBrowsingExtendedReportingOptInAllowed, base::Value(false));
+
+  // Disable search suggestion
+  registry->SetDefaultPrefValue(prefs::kSearchSuggestEnabled, base::Value(false));
 }
 
 }  // namespace brave
diff --git a/browser/brave_profile_prefs_browsertest.cc b/browser/brave_profile_prefs_browsertest.cc
@@ -8,6 +8,8 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/prefs/pref_service.h"
+#include "components/safe_browsing/common/safe_browsing_prefs.h"
+#include "components/spellcheck/browser/pref_names.h"
 
 using BraveProfilePrefsBrowserTest = InProcessBrowserTest;
 
@@ -18,3 +20,14 @@ IN_PROC_BROWSER_TEST_F(BraveProfilePrefsBrowserTest, DownloadPromptDefault) {
   EXPECT_FALSE(
       browser()->profile()->GetPrefs()->GetBoolean(kWidevineOptedIn));
 }
+
+IN_PROC_BROWSER_TEST_F(BraveProfilePrefsBrowserTest, DisableGoogleServicesByDefault) {
+  EXPECT_FALSE(
+      browser()->profile()->GetPrefs()->GetBoolean(prefs::kAlternateErrorPagesEnabled));
+  EXPECT_FALSE(
+      browser()->profile()->GetPrefs()->GetBoolean(spellcheck::prefs::kSpellCheckUseSpellingService));
+  EXPECT_FALSE(
+      browser()->profile()->GetPrefs()->GetBoolean(prefs::kSafeBrowsingExtendedReportingOptInAllowed));
+  EXPECT_FALSE(
+      browser()->profile()->GetPrefs()->GetBoolean(prefs::kSearchSuggestEnabled));
+}
diff --git a/browser/resources/settings/brave_page_visibility.js b/browser/resources/settings/brave_page_visibility.js
@@ -19,9 +19,16 @@ cr.define('settings', function() {
     }
   };
 
+  const privacyHandler = {
+    get: function(obj, prop) {
+      return prop === 'searchPrediction' ? false : true;
+    }
+  }
+
   const handler = {
     get: function(obj, prop) {
       if (prop === 'appearance') return new Proxy({}, appearanceHandler);
+      if (prop === 'privacy') return new Proxy({}, privacyHandler);
       return prop === 'a11y' ? false : true;
     }
   };

diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch
@@ -0,0 +1,31 @@
+diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
+index c938b42ff11691e4e5e915e7c4d6f36de58d82cb..48febf5e052144fcaed8fd30c62a09a0e9d21b38 100644
+--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
++++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
+@@ -68,9 +68,11 @@
+         <div class="settings-box first">
+           <p class="privacy-explanation">$i18nRaw{improveBrowsingExperience}</p>
+         </div>
++<if expr="_google_chrome">
+         <settings-toggle-button pref="{{prefs.alternate_error_pages.enabled}}"
+             label="$i18n{linkDoctorPref}">
+         </settings-toggle-button>
++</if>
+         <settings-toggle-button hidden="[[!pageVisibility.searchPrediction]]"
+             pref="{{prefs.search.suggest_enabled}}"
+             label="$i18n{searchSuggestPref}">
+@@ -80,12 +82,14 @@
+             label="$i18n{networkPredictionEnabled}"
+             numeric-unchecked-value="[[networkPredictionEnum_.NEVER]]">
+         </settings-toggle-button>
++<if expr="_google_chrome">
+         <settings-toggle-button id="safeBrowsingExtendedReportingControl"
+             pref="[[safeBrowsingExtendedReportingPref_]]"
+             label="$i18n{safeBrowsingEnableExtendedReporting}"
+             on-settings-boolean-control-change="onSberChange_"
+             no-set-pref>
+         </settings-toggle-button>
++</if>
+         <settings-toggle-button pref="{{prefs.safebrowsing.enabled}}"
+             label="$i18n{safeBrowsingEnableProtection}">
+         </settings-toggle-button>