Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-21 09:49:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1188158 - Move nsIPrivateBrowsingTrackingProtectionWhitelist to its own component in toolkit; r=jdm

Browse Source 
--HG--
rename : toolkit/components/url-classifier/nsURLClassifier.manifest => toolkit/components/privatebrowsing/PrivateBrowsing.manifest
rename : toolkit/components/url-classifier/PrivateBrowsingTrackingProtectionWhitelist.js => toolkit/components/privatebrowsing/PrivateBrowsingTrackingProtectionWhitelist.js
rename : toolkit/components/url-classifier/moz.build => toolkit/components/privatebrowsing/moz.build
rename : toolkit/components/url-classifier/nsIPrivateBrowsingTrackingProtectionWhitelist.idl => toolkit/components/privatebrowsing/nsIPrivateBrowsingTrackingProtectionWhitelist.idl
This commit is contained in:
Ehsan Akhgari 2015-07-28 12:17:18 -04:00
parent 4091b5d747
commit 736bd7b4ce
11 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
b2g/installer/package-manifest.in
View File

@ -709,9 +709,13 @@
@RESPATH@/components/nsUrlClassifierHashCompleter.js
@RESPATH@/components/nsUrlClassifierListManager.js
@RESPATH@/components/nsUrlClassifierLib.js
@RESPATH@/components/PrivateBrowsingTrackingProtectionWhitelist.js
@RESPATH@/components/url-classifier.xpt
; Private Browsing
@RESPATH@/components/privatebrowsing.xpt
@RESPATH@/components/PrivateBrowsing.manifest
@RESPATH@/components/PrivateBrowsingTrackingProtectionWhitelist.js
; GNOME hooks
#ifdef MOZ_ENABLE_GNOME_COMPONENT
@RESPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@

6
browser/installer/package-manifest.in
View File

@ -638,10 +638,14 @@
@RESPATH@/components/nsUrlClassifierHashCompleter.js
@RESPATH@/components/nsUrlClassifierListManager.js
@RESPATH@/components/nsUrlClassifierLib.js
@RESPATH@/components/PrivateBrowsingTrackingProtectionWhitelist.js
@RESPATH@/components/url-classifier.xpt
#endif
; Private Browsing
@RESPATH@/components/privatebrowsing.xpt
@RESPATH@/components/PrivateBrowsing.manifest
@RESPATH@/components/PrivateBrowsingTrackingProtectionWhitelist.js
; ANGLE GLES-on-D3D rendering library
#ifdef MOZ_ANGLE_RENDERER
@BINPATH@/libEGL.dll

6
mobile/android/installer/package-manifest.in
View File

@ -480,10 +480,14 @@
@BINPATH@/components/nsUrlClassifierHashCompleter.js
@BINPATH@/components/nsUrlClassifierListManager.js
@BINPATH@/components/nsUrlClassifierLib.js
@BINPATH@/components/PrivateBrowsingTrackingProtectionWhitelist.js
@BINPATH@/components/url-classifier.xpt
#endif
; Private Browsing
@RESPATH@/components/privatebrowsing.xpt
@RESPATH@/components/PrivateBrowsing.manifest
@RESPATH@/components/PrivateBrowsingTrackingProtectionWhitelist.js
; GNOME hooks
#ifdef MOZ_ENABLE_GNOME_COMPONENT
@BINPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@

1
toolkit/components/moz.build
View File

@ -37,6 +37,7 @@ DIRS += [
'passwordmgr',
'perf',
'places',
'privatebrowsing',
'processsingleton',
'promiseworker',
'prompts',

2
toolkit/components/privatebrowsing/PrivateBrowsing.manifest Normal file
View File

@ -0,0 +1,2 @@
component {a319b616-c45d-4037-8d86-01c592b5a9af} PrivateBrowsingTrackingProtectionWhitelist.js
contract @mozilla.org/pbm-tp-whitelist;1 {a319b616-c45d-4037-8d86-01c592b5a9af}

0
toolkit/components/url-classifier/PrivateBrowsingTrackingProtectionWhitelist.js → toolkit/components/privatebrowsing/PrivateBrowsingTrackingProtectionWhitelist.js
View File

16
toolkit/components/privatebrowsing/moz.build Normal file
View File

@ -0,0 +1,16 @@
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# 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/.
XPIDL_SOURCES += [
'nsIPrivateBrowsingTrackingProtectionWhitelist.idl',
]
XPIDL_MODULE = 'privatebrowsing'
EXTRA_COMPONENTS += [
'PrivateBrowsing.manifest',
'PrivateBrowsingTrackingProtectionWhitelist.js',
]

2
toolkit/components/url-classifier/nsIPrivateBrowsingTrackingProtectionWhitelist.idl → toolkit/components/privatebrowsing/nsIPrivateBrowsingTrackingProtectionWhitelist.idl
View File

@ -42,5 +42,5 @@ interface nsIPrivateBrowsingTrackingProtectionWhitelist : nsISupports
};
%{ C++
#define NS_PBTRACKINGPROTECTIONWHITELIST_CONTRACTID "@mozilla.org/url-classifier/pbm-tp-whitelist;1"
#define NS_PBTRACKINGPROTECTIONWHITELIST_CONTRACTID "@mozilla.org/pbm-tp-whitelist;1"
%}

2
toolkit/components/url-classifier/moz.build
View File

@ -7,7 +7,6 @@
TEST_DIRS += ['tests']
XPIDL_SOURCES += [
'nsIPrivateBrowsingTrackingProtectionWhitelist.idl',
'nsIUrlClassifierDBService.idl',
'nsIUrlClassifierHashCompleter.idl',
'nsIUrlClassifierPrefixSet.idl',
@ -43,7 +42,6 @@ SOURCES += [
EXTRA_COMPONENTS += [
'nsURLClassifier.manifest',
'nsUrlClassifierHashCompleter.js',
'PrivateBrowsingTrackingProtectionWhitelist.js',
]
# Same as JS components that are run through the pre-processor.

2
toolkit/components/url-classifier/nsURLClassifier.manifest
View File

@ -4,5 +4,3 @@ component {ca168834-cc00-48f9-b83c-fd018e58cae3} nsUrlClassifierListManager.js
contract @mozilla.org/url-classifier/listmanager;1 {ca168834-cc00-48f9-b83c-fd018e58cae3}
component {9111de73-9322-4bfc-8b65-2b727f3e6ec8} nsUrlClassifierHashCompleter.js
contract @mozilla.org/url-classifier/hashcompleter;1 {9111de73-9322-4bfc-8b65-2b727f3e6ec8}
component {a319b616-c45d-4037-8d86-01c592b5a9af} PrivateBrowsingTrackingProtectionWhitelist.js
contract @mozilla.org/url-classifier/pbm-tp-whitelist;1 {a319b616-c45d-4037-8d86-01c592b5a9af}

4
toolkit/modules/PrivateBrowsingUtils.jsm
View File

@ -52,13 +52,13 @@ this.PrivateBrowsingUtils = {
},
addToTrackingAllowlist(aURI) {
let pbmtpWhitelist = Cc["@mozilla.org/url-classifier/pbm-tp-whitelist;1"]
let pbmtpWhitelist = Cc["@mozilla.org/pbm-tp-whitelist;1"]
.getService(Ci.nsIPrivateBrowsingTrackingProtectionWhitelist);
pbmtpWhitelist.addToAllowList(aURI);
},
removeFromTrackingAllowlist(aURI) {
let pbmtpWhitelist = Cc["@mozilla.org/url-classifier/pbm-tp-whitelist;1"]
let pbmtpWhitelist = Cc["@mozilla.org/pbm-tp-whitelist;1"]
.getService(Ci.nsIPrivateBrowsingTrackingProtectionWhitelist);
pbmtpWhitelist.removeFromAllowList(aURI);
},