| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * This file is part of the Adblock Plus extension, | 2  * This file is part of the Adblock Plus extension, | 
| 3  * Copyright (C) 2006-2012 Eyeo GmbH | 3  * Copyright (C) 2006-2012 Eyeo GmbH | 
| 4  * | 4  * | 
| 5  * Adblock Plus is free software: you can redistribute it and/or modify | 5  * Adblock Plus is free software: you can redistribute it and/or modify | 
| 6  * it under the terms of the GNU General Public License version 3 as | 6  * it under the terms of the GNU General Public License version 3 as | 
| 7  * published by the Free Software Foundation. | 7  * published by the Free Software Foundation. | 
| 8  * | 8  * | 
| 9  * Adblock Plus is distributed in the hope that it will be useful, | 9  * Adblock Plus is distributed in the hope that it will be useful, | 
| 10  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| 11  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 11  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 
| 12  * GNU General Public License for more details. | 12  * GNU General Public License for more details. | 
| 13  * | 13  * | 
| 14  * You should have received a copy of the GNU General Public License | 14  * You should have received a copy of the GNU General Public License | 
| 15  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>. | 15  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>. | 
| 16  */ | 16  */ | 
| 17 | 17 | 
| 18 chrome.webRequest.onBeforeRequest.addListener(onBeforeRequest, {urls: ["http://*
     /*", "https://*/*"]}, ["blocking"]); | 18 chrome.webRequest.onBeforeRequest.addListener(onBeforeRequest, {urls: ["http://*
     /*", "https://*/*"]}, ["blocking"]); | 
| 19 chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, {urls: ["http
     ://*/*", "https://*/*"]}, ["responseHeaders"]); | 19 chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, {urls: ["http
     ://*/*", "https://*/*"]}, ["responseHeaders"]); | 
|  | 20 chrome.tabs.onUpdated.addListener(forgetTab); | 
| 20 chrome.tabs.onRemoved.addListener(forgetTab); | 21 chrome.tabs.onRemoved.addListener(forgetTab); | 
| 21 | 22 | 
| 22 var onFilterChangeTimeout = null; | 23 var onFilterChangeTimeout = null; | 
| 23 function onFilterChange() | 24 function onFilterChange() | 
| 24 { | 25 { | 
| 25   onFilterChangeTimeout = null; | 26   onFilterChangeTimeout = null; | 
| 26   chrome.webRequest.handlerBehaviorChanged(); | 27   chrome.webRequest.handlerBehaviorChanged(); | 
| 27 } | 28 } | 
| 28 | 29 | 
| 29 var importantNotifications = { | 30 var importantNotifications = { | 
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 190     parent = frameData.parent; | 191     parent = frameData.parent; | 
| 191     parentData = getFrameData(tabId, parent); | 192     parentData = getFrameData(tabId, parent); | 
| 192 | 193 | 
| 193     var frameUrl = frameData.url; | 194     var frameUrl = frameData.url; | 
| 194     var parentUrl = (parentData ? parentData.url : frameUrl); | 195     var parentUrl = (parentData ? parentData.url : frameUrl); | 
| 195     if ("keyException" in frameData || isWhitelisted(frameUrl, parentUrl, type)) | 196     if ("keyException" in frameData || isWhitelisted(frameUrl, parentUrl, type)) | 
| 196       return true; | 197       return true; | 
| 197   } | 198   } | 
| 198   return false; | 199   return false; | 
| 199 } | 200 } | 
| OLD | NEW | 
|---|