| 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 178 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  189     { |  189     { | 
|  190       return [urls ? {urls: urls} : {}, ["blocking"]]; |  190       return [urls ? {urls: urls} : {}, ["blocking"]]; | 
|  191     } |  191     } | 
|  192   }; |  192   }; | 
|  193  |  193  | 
|  194  |  194  | 
|  195   /* Tabs */ |  195   /* Tabs */ | 
|  196  |  196  | 
|  197   var sendMessage = chrome.tabs.sendMessage || chrome.tabs.sendRequest; |  197   var sendMessage = chrome.tabs.sendMessage || chrome.tabs.sendRequest; | 
|  198  |  198  | 
|  199   var PageAction = function(tabId) |  199   var BrowserAction = function(tabId) | 
|  200   { |  200   { | 
|  201     this._tabId = tabId; |  201     this._tabId = tabId; | 
|  202   }; |  202   }; | 
|  203   PageAction.prototype = { |  203   BrowserAction.prototype = { | 
|  204     setIcon: function(path) |  204     setIcon: function(path) | 
|  205     { |  205     { | 
|  206       chrome.pageAction.setIcon({tabId: this._tabId, path: path}); |  206       chrome.browserAction.setIcon({tabId: this._tabId, path: path}); | 
|  207     }, |  207     }, | 
|  208     setTitle: function(title) |  208     setTitle: function(title) | 
|  209     { |  209     { | 
|  210       chrome.pageAction.setTitle({tabId: this._tabId, title: title}); |  210       chrome.browserAction.setTitle({tabId: this._tabId, title: title}); | 
|  211     }, |  211     }, | 
|  212     hide: function() |  212     hide: function() | 
|  213     { |  213     { | 
|  214       chrome.pageAction.hide(this._tabId); |  214       chrome.browserAction.hide(this._tabId); | 
|  215     }, |  215     }, | 
|  216     show: function() |  216     show: function() | 
|  217     { |  217     { | 
|  218       chrome.pageAction.show(this._tabId); |  218       chrome.browserAction.show(this._tabId); | 
 |  219     }, | 
 |  220     setBadgeBackgroundColor: function(color) | 
 |  221     { | 
 |  222       chrome.browserAction.setBadgeBackgroundColor({tabId: this._tabId, color: c
     olor}); | 
 |  223     }, | 
 |  224     setBadgeText: function(text) | 
 |  225     { | 
 |  226       chrome.browserAction.setBadgeText({tabId: this._tabId, text: text}); | 
|  219     } |  227     } | 
|  220   }; |  228   }; | 
|  221  |  229  | 
|  222   Tab = function(tab) |  230   Tab = function(tab) | 
|  223   { |  231   { | 
|  224     this._id = tab.id; |  232     this._id = tab.id; | 
|  225  |  233  | 
|  226     this.url = tab.url; |  234     this.url = tab.url; | 
|  227     this.pageAction = new PageAction(tab.id); |  235     this.browserAction = new BrowserAction(tab.id); | 
|  228  |  236  | 
|  229     this.onLoading = ext.tabs.onLoading._bindToTab(this); |  237     this.onLoading = ext.tabs.onLoading._bindToTab(this); | 
|  230     this.onCompleted = ext.tabs.onCompleted._bindToTab(this); |  238     this.onCompleted = ext.tabs.onCompleted._bindToTab(this); | 
|  231     this.onActivated = ext.tabs.onActivated._bindToTab(this); |  239     this.onActivated = ext.tabs.onActivated._bindToTab(this); | 
|  232     this.onRemoved = ext.tabs.onRemoved._bindToTab(this); |  240     this.onRemoved = ext.tabs.onRemoved._bindToTab(this); | 
|  233   }; |  241   }; | 
|  234   Tab.prototype = { |  242   Tab.prototype = { | 
|  235     close: function() |  243     close: function() | 
|  236     { |  244     { | 
|  237       chrome.tabs.remove(this._id); |  245       chrome.tabs.remove(this._id); | 
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  344     onCompleted: new CompletedTabEventTarget(), |  352     onCompleted: new CompletedTabEventTarget(), | 
|  345     onActivated: new ActivatedTabEventTarget(), |  353     onActivated: new ActivatedTabEventTarget(), | 
|  346     onRemoved: new RemovedTabEventTarget() |  354     onRemoved: new RemovedTabEventTarget() | 
|  347   }; |  355   }; | 
|  348  |  356  | 
|  349   ext.webRequest = { |  357   ext.webRequest = { | 
|  350     onBeforeRequest: new BeforeRequestEventTarget(), |  358     onBeforeRequest: new BeforeRequestEventTarget(), | 
|  351     handlerBehaviorChanged: chrome.webRequest.handlerBehaviorChanged |  359     handlerBehaviorChanged: chrome.webRequest.handlerBehaviorChanged | 
|  352   }; |  360   }; | 
|  353 })(); |  361 })(); | 
| OLD | NEW |