Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 07:13:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1649883 - Fix user pref for pocket toggle off. r=gvn,remote-protocol-reviewers,perftest-reviewers,maja_zf

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D82773
This commit is contained in:
Scott 2020-07-15 14:51:02 +00:00
parent 897775d6e4
commit 2bcdc17387
8 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/components/enterprisepolicies/Policies.jsm
View File

@ -1052,7 +1052,7 @@ var Policies = {
}
if ("Pocket" in param) {
setDefaultPref(
"browser.newtabpage.activity-stream.feeds.section.topstories",
"browser.newtabpage.activity-stream.feeds.system.topstories",
param.Pocket,
locked
);

2
browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js
View File

@ -556,7 +556,7 @@ const POLICIES_TESTS = [
},
lockedPrefs: {
"browser.newtabpage.activity-stream.feeds.snippets": false,
"browser.newtabpage.activity-stream.feeds.section.topstories": false,
"browser.newtabpage.activity-stream.feeds.system.topstories": false,
},
},

7
browser/components/newtab/lib/ActivityStream.jsm
View File

@ -607,13 +607,6 @@ const FEEDS_DATA = [
"System pref that fetches content recommendations from a configurable content provider",
// Dynamically determine if Pocket should be shown for a geo / locale
getValue: ({ geo, locale }) => {
const userPreffedStoriesBool = Services.prefs.getBoolPref(
"browser.newtabpage.activity-stream.feeds.section.topstories",
false
);
if (!userPreffedStoriesBool) {
return false;
}
const preffedRegionsString =
Services.prefs.getStringPref(REGION_STORIES_CONFIG) || "";
const preffedRegions = preffedRegionsString.split(",").map(s => s.trim());

1
browser/components/newtab/test/browser/abouthomecache/browser.ini
View File

@ -10,6 +10,7 @@ prefs =
browser.startup.homepage.abouthome_cache.testing=true
browser.startup.page=1
browser.newtabpage.activity-stream.discoverystream.endpoints=data:
browser.newtabpage.activity-stream.feeds.system.topstories=true
browser.newtabpage.activity-stream.feeds.section.topstories=true
browser.newtabpage.activity-stream.feeds.system.topstories=true
browser.newtabpage.activity-stream.feeds.section.topstories.options={"provider_name":""}

1
browser/components/newtab/test/browser/browser.ini
View File

@ -10,6 +10,7 @@ prefs =
browser.newtabpage.activity-stream.debug=false
browser.newtabpage.activity-stream.discoverystream.enabled=true
browser.newtabpage.activity-stream.discoverystream.endpoints=data:
browser.newtabpage.activity-stream.feeds.system.topstories=true
browser.newtabpage.activity-stream.feeds.section.topstories=true
browser.newtabpage.activity-stream.feeds.section.topstories.options={"provider_name":""}

2
remote/test/puppeteer/src/node/Launcher.ts
View File

@ -513,7 +513,7 @@ class FirefoxLauncher implements ProductLauncher {
// https://bugzilla.mozilla.org/show_bug.cgi?id=1543115
'browser.dom.window.dump.enabled': true,
// Disable topstories
'browser.newtabpage.activity-stream.feeds.section.topstories': false,
'browser.newtabpage.activity-stream.feeds.system.topstories': false,
// Always display a blank page
'browser.newtabpage.enabled': false,
// Background thumbnails in particular cause grief: and disabling

2
testing/profiles/common/user.js
View File

@ -12,7 +12,7 @@ user_pref("browser.newtabpage.activity-stream.asrouter.providers.snippets", "[]"
user_pref("browser.newtabpage.activity-stream.asrouter.providers.message-groups", "[]");
user_pref("browser.newtabpage.activity-stream.asrouter.providers.whats-new-panel", "[]");
user_pref("browser.newtabpage.activity-stream.asrouter.providers.messaging-experiments", "[]");
user_pref("browser.newtabpage.activity-stream.feeds.section.topstories", false);
user_pref("browser.newtabpage.activity-stream.feeds.system.topstories", false);
user_pref("browser.newtabpage.activity-stream.feeds.snippets", false);
user_pref("browser.newtabpage.activity-stream.tippyTop.service.endpoint", "");
user_pref("browser.newtabpage.activity-stream.discoverystream.config", "[]");

1
testing/talos/talos/test.py
View File

@ -1078,6 +1078,7 @@ class about_newtab_with_snippets(PageloaderTest):
"http://fakedomain/tests/about-newtab/snippets.json",\
"updateCycleInMs":14400000}',
'browser.newtabpage.activity-stream.feeds.snippets': True,
'browser.newtabpage.activity-stream.feeds.system.topstories': True,
'browser.newtabpage.activity-stream.feeds.section.topstories': True,
'browser.newtabpage.activity-stream.feeds.section.topstories.options':\
'{"provider_name":""}',