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