fix site hacks for wired.com and extremetech.com

auditors @bbondy @BrendanEich @jonathansampson
brave · Dec 18, 2016 · be32eaf · be32eaf
1 parent daa7743
commit be32eaf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/app/extensions/brave/content/scripts/navigator.js b/app/extensions/brave/content/scripts/navigator.js
@@ -15,3 +15,7 @@ chrome.webFrame.setGlobal("navigator.getBattery", function () {
 if (chrome.contentSettings.doNotTrack == 'allow') {
   executeScript("window.Navigator.prototype.__defineGetter__('doNotTrack', () => { return 1 })")
 }
+
+if (chrome.contentSettings.ads == 'block') {
+  chrome.webFrame.setGlobal("window.google_onload_fired", true)
+}
diff --git a/js/state/contentSettings.js b/js/state/contentSettings.js
@@ -65,6 +65,10 @@ const getDefaultUserPrefContentSettings = (braveryDefaults, appSettings, appConf
       setting: braveryDefaults.adControl === 'showBraveAds' ? 'allow' : 'block',
       primaryPattern: '*'
     }],
+    ads: [{
+      setting: ['blockAds', 'showBraveAds'].includes(braveryDefaults.adControl) ? 'block' : 'allow',
+      primaryPattern: '*'
+    }],
     doNotTrack: [{
       setting: getSetting(settings.DO_NOT_TRACK, appSettings) ? 'allow' : 'block',
       primaryPattern: '*'