| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * This file is part of Adblock Plus <https://adblockplus.org/>, | 2  * This file is part of Adblock Plus <https://adblockplus.org/>, | 
| 3  * Copyright (C) 2006-2017 eyeo GmbH | 3  * Copyright (C) 2006-2017 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 197 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 208 | 208 | 
| 209     /** | 209     /** | 
| 210      * Container of name-value pairs representing a set of preferences. | 210      * Container of name-value pairs representing a set of preferences. | 
| 211      */ | 211      */ | 
| 212     typedef std::map<std::string, AdblockPlus::JsValue> Prefs; | 212     typedef std::map<std::string, AdblockPlus::JsValue> Prefs; | 
| 213 | 213 | 
| 214     /** | 214     /** | 
| 215      * Callback type invoked when a new notification should be shown. | 215      * Callback type invoked when a new notification should be shown. | 
| 216      * The parameter is the Notification object to be shown. | 216      * The parameter is the Notification object to be shown. | 
| 217      */ | 217      */ | 
| 218     typedef std::function<void(const NotificationPtr&)> ShowNotificationCallback
     ; | 218     typedef std::function<void(Notification&)> ShowNotificationCallback; | 
| 219 | 219 | 
| 220     /** | 220     /** | 
| 221      * Callback function returning false when current connection is not | 221      * Callback function returning false when current connection is not | 
| 222      * allowedConnectionType, e.g. because it is a metered connection. | 222      * allowedConnectionType, e.g. because it is a metered connection. | 
| 223      */ | 223      */ | 
| 224     typedef std::function<bool(const std::string* allowedConnectionType)> IsConn
     ectionAllowedCallback; | 224     typedef std::function<bool(const std::string* allowedConnectionType)> IsConn
     ectionAllowedCallback; | 
| 225 | 225 | 
| 226     /** | 226     /** | 
| 227      * FilterEngine creation parameters. | 227      * FilterEngine creation parameters. | 
| 228      */ | 228      */ | 
| (...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 540       const JsValueList& param) const; | 540       const JsValueList& param) const; | 
| 541     FilterPtr GetWhitelistingFilter(const std::string& url, | 541     FilterPtr GetWhitelistingFilter(const std::string& url, | 
| 542       ContentTypeMask contentTypeMask, const std::string& documentUrl) const; | 542       ContentTypeMask contentTypeMask, const std::string& documentUrl) const; | 
| 543     FilterPtr GetWhitelistingFilter(const std::string& url, | 543     FilterPtr GetWhitelistingFilter(const std::string& url, | 
| 544       ContentTypeMask contentTypeMask, | 544       ContentTypeMask contentTypeMask, | 
| 545       const std::vector<std::string>& documentUrls) const; | 545       const std::vector<std::string>& documentUrls) const; | 
| 546   }; | 546   }; | 
| 547 } | 547 } | 
| 548 | 548 | 
| 549 #endif | 549 #endif | 
| OLD | NEW | 
|---|