| OLD | NEW |
| 1 /* | 1 /* |
| 2 * This file is part of Adblock Plus <http://adblockplus.org/>, | 2 * This file is part of Adblock Plus <http://adblockplus.org/>, |
| 3 * Copyright (C) 2006-2013 Eyeo GmbH | 3 * Copyright (C) 2006-2013 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 |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 { | 69 { |
| 70 function onHeadersReceived(details) | 70 function onHeadersReceived(details) |
| 71 { | 71 { |
| 72 if (details.tabId == -1) | 72 if (details.tabId == -1) |
| 73 return; | 73 return; |
| 74 | 74 |
| 75 if (details.type != "main_frame" && details.type != "sub_frame") | 75 if (details.type != "main_frame" && details.type != "sub_frame") |
| 76 return; | 76 return; |
| 77 | 77 |
| 78 var page = new ext.Page({id: details.tabId}); | 78 var page = new ext.Page({id: details.tabId}); |
| 79 var frame = new ext.Frame({frameId: details.frameId, tabId: details.tabId}); | 79 var frame = ext.getFrame(details.tabId, details.frameId); |
| 80 | 80 |
| 81 if (frame.url != details.url) | 81 if (!frame || frame.url != details.url) |
| 82 return; | 82 return; |
| 83 | 83 |
| 84 for (var i = 0; i < details.responseHeaders.length; i++) | 84 for (var i = 0; i < details.responseHeaders.length; i++) |
| 85 { | 85 { |
| 86 var header = details.responseHeaders[i]; | 86 var header = details.responseHeaders[i]; |
| 87 if (header.name.toLowerCase() == "x-adblock-key" && header.value) | 87 if (header.name.toLowerCase() == "x-adblock-key" && header.value) |
| 88 processKeyException(header.value, page, frame); | 88 processKeyException(header.value, page, frame); |
| 89 } | 89 } |
| 90 } | 90 } |
| 91 | 91 |
| 92 chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, {urls: ["<a
ll_urls>"]}, ["responseHeaders"]); | 92 chrome.webRequest.onHeadersReceived.addListener(onHeadersReceived, {urls: ["<a
ll_urls>"]}, ["responseHeaders"]); |
| 93 } | 93 } |
| OLD | NEW |