Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: mobile/android/app/mobile.js

Issue 29430589: Issue 5194 - Remove Tracking Protection from Private Browsing (Closed)
Patch Set: Created May 5, 2017, 2:21 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | mobile/android/base/resources/xml/preferences_privacy.xml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* This Source Code Form is subject to the terms of the Mozilla Public 1 /* This Source Code Form is subject to the terms of the Mozilla Public
2 * License, v. 2.0. If a copy of the MPL was not distributed with this 2 * License, v. 2.0. If a copy of the MPL was not distributed with this
3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4 4
5 #filter substitution 5 #filter substitution
6 6
7 // For browser.xml binding 7 // For browser.xml binding
8 // 8 //
9 // cacheRatio* is a ratio that determines the amount of pixels to cache. The 9 // cacheRatio* is a ratio that determines the amount of pixels to cache. The
10 // ratio is multiplied by the viewport width or height to get the displayport's 10 // ratio is multiplied by the viewport width or height to get the displayport's
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 pref("browser.search.order.US.1", "chrome://browser/locale/region.properties"); 280 pref("browser.search.order.US.1", "chrome://browser/locale/region.properties");
281 pref("browser.search.order.US.2", "chrome://browser/locale/region.properties"); 281 pref("browser.search.order.US.2", "chrome://browser/locale/region.properties");
282 pref("browser.search.order.US.3", "chrome://browser/locale/region.properties"); 282 pref("browser.search.order.US.3", "chrome://browser/locale/region.properties");
283 // Added 4+5 (just in case) according to https://issues.adblockplus.org/ticket/3 128 283 // Added 4+5 (just in case) according to https://issues.adblockplus.org/ticket/3 128
284 pref("browser.search.order.US.4", "chrome://browser/locale/region.properties"); 284 pref("browser.search.order.US.4", "chrome://browser/locale/region.properties");
285 pref("browser.search.order.US.5", "chrome://browser/locale/region.properties"); 285 pref("browser.search.order.US.5", "chrome://browser/locale/region.properties");
286 286
287 // disable updating 287 // disable updating
288 pref("browser.search.update", false); 288 pref("browser.search.update", false);
289 289
290 // Disabled tracking protection for private browsing. See https://issues.adblock plus.org/ticket/5194
290 // enable tracking protection for private browsing 291 // enable tracking protection for private browsing
291 pref("privacy.trackingprotection.pbmode.enabled", true); 292 pref("privacy.trackingprotection.pbmode.enabled", false);
292 293
293 // disable search suggestions by default 294 // disable search suggestions by default
294 pref("browser.search.suggest.enabled", false); 295 pref("browser.search.suggest.enabled", false);
295 pref("browser.search.suggest.prompted", false); 296 pref("browser.search.suggest.prompted", false);
296 297
297 // tell the search service that we don't really expose the "current engine" 298 // tell the search service that we don't really expose the "current engine"
298 pref("browser.search.noCurrentEngine", true); 299 pref("browser.search.noCurrentEngine", true);
299 300
300 // Control media casting & mirroring features 301 // Control media casting & mirroring features
301 pref("browser.casting.enabled", true); 302 pref("browser.casting.enabled", true);
(...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after
973 pref("identity.fxaccounts.remote.webchannel.uri", "https://accounts.firefox.com" ); 974 pref("identity.fxaccounts.remote.webchannel.uri", "https://accounts.firefox.com" );
974 975
975 // The remote URL of the Firefox Account profile server. 976 // The remote URL of the Firefox Account profile server.
976 pref("identity.fxaccounts.remote.profile.uri", "https://profile.accounts.firefox .com/v1"); 977 pref("identity.fxaccounts.remote.profile.uri", "https://profile.accounts.firefox .com/v1");
977 978
978 // The remote URL of the Firefox Account oauth server. 979 // The remote URL of the Firefox Account oauth server.
979 pref("identity.fxaccounts.remote.oauth.uri", "https://oauth.accounts.firefox.com /v1"); 980 pref("identity.fxaccounts.remote.oauth.uri", "https://oauth.accounts.firefox.com /v1");
980 981
981 // Token server used by Firefox Account-authenticated Sync. 982 // Token server used by Firefox Account-authenticated Sync.
982 pref("identity.sync.tokenserver.uri", "https://token.services.mozilla.com/1.0/sy nc/1.5"); 983 pref("identity.sync.tokenserver.uri", "https://token.services.mozilla.com/1.0/sy nc/1.5");
OLDNEW
« no previous file with comments | « no previous file | mobile/android/base/resources/xml/preferences_privacy.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld