| 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-2014 Eyeo GmbH | 3  * Copyright (C) 2006-2014 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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 152   public: | 152   public: | 
| 153     // Make sure to keep ContentType in sync with FilterEngine::contentTypes | 153     // Make sure to keep ContentType in sync with FilterEngine::contentTypes | 
| 154     /** | 154     /** | 
| 155      * Possible resource content types. | 155      * Possible resource content types. | 
| 156      */ | 156      */ | 
| 157     enum ContentType {CONTENT_TYPE_OTHER, CONTENT_TYPE_SCRIPT, | 157     enum ContentType {CONTENT_TYPE_OTHER, CONTENT_TYPE_SCRIPT, | 
| 158                       CONTENT_TYPE_IMAGE, CONTENT_TYPE_STYLESHEET, | 158                       CONTENT_TYPE_IMAGE, CONTENT_TYPE_STYLESHEET, | 
| 159                       CONTENT_TYPE_OBJECT, CONTENT_TYPE_SUBDOCUMENT, | 159                       CONTENT_TYPE_OBJECT, CONTENT_TYPE_SUBDOCUMENT, | 
| 160                       CONTENT_TYPE_DOCUMENT, CONTENT_TYPE_XMLHTTPREQUEST, | 160                       CONTENT_TYPE_DOCUMENT, CONTENT_TYPE_XMLHTTPREQUEST, | 
| 161                       CONTENT_TYPE_OBJECT_SUBREQUEST, CONTENT_TYPE_FONT, | 161                       CONTENT_TYPE_OBJECT_SUBREQUEST, CONTENT_TYPE_FONT, | 
| 162                       CONTENT_TYPE_MEDIA}; | 162                       CONTENT_TYPE_MEDIA, CONTENT_TYPE_ELEMHIDE}; | 
| 163 | 163 | 
| 164     /** | 164     /** | 
| 165      * Callback type invoked when an update becomes available. | 165      * Callback type invoked when an update becomes available. | 
| 166      * The parameter is the download URL of the update. | 166      * The parameter is the download URL of the update. | 
| 167      */ | 167      */ | 
| 168     typedef std::tr1::function<void(const std::string&)> | 168     typedef std::tr1::function<void(const std::string&)> | 
| 169         UpdateAvailableCallback; | 169         UpdateAvailableCallback; | 
| 170 | 170 | 
| 171     /** | 171     /** | 
| 172      * Callback type invoked when a manually triggered update check finishes. | 172      * Callback type invoked when a manually triggered update check finishes. | 
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 374                                ContentType contentType, | 374                                ContentType contentType, | 
| 375                                const std::string& documentUrl) const; | 375                                const std::string& documentUrl) const; | 
| 376     void UpdateAvailable(UpdateAvailableCallback callback, JsValueList& params); | 376     void UpdateAvailable(UpdateAvailableCallback callback, JsValueList& params); | 
| 377     void UpdateCheckDone(const std::string& eventName, | 377     void UpdateCheckDone(const std::string& eventName, | 
| 378                          UpdateCheckDoneCallback callback, JsValueList& params); | 378                          UpdateCheckDoneCallback callback, JsValueList& params); | 
| 379     void FilterChanged(FilterChangeCallback callback, JsValueList& params); | 379     void FilterChanged(FilterChangeCallback callback, JsValueList& params); | 
| 380   }; | 380   }; | 
| 381 } | 381 } | 
| 382 | 382 | 
| 383 #endif | 383 #endif | 
| OLD | NEW | 
|---|