| 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 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 | 227 |
| 228 /** | 228 /** |
| 229 * Container of name-value pairs representing a set of preferences. | 229 * Container of name-value pairs representing a set of preferences. |
| 230 */ | 230 */ |
| 231 typedef std::map<std::string, AdblockPlus::JsValue> Prefs; | 231 typedef std::map<std::string, AdblockPlus::JsValue> Prefs; |
| 232 | 232 |
| 233 /** | 233 /** |
| 234 * Callback type invoked when a new notification should be shown. | 234 * Callback type invoked when a new notification should be shown. |
| 235 * The parameter is the Notification object to be shown. | 235 * The parameter is the Notification object to be shown. |
| 236 */ | 236 */ |
| 237 typedef std::function<void(const NotificationPtr&)> ShowNotificationCallback
; | 237 typedef std::function<void(Notification&)> ShowNotificationCallback; |
| 238 | 238 |
| 239 /** | 239 /** |
| 240 * Callback function returning false when current connection is not | 240 * Callback function returning false when current connection is not |
| 241 * allowedConnectionType, e.g. because it is a metered connection. | 241 * allowedConnectionType, e.g. because it is a metered connection. |
| 242 */ | 242 */ |
| 243 typedef std::function<bool(const std::string* allowedConnectionType)> IsConn
ectionAllowedCallback; | 243 typedef std::function<bool(const std::string* allowedConnectionType)> IsConn
ectionAllowedCallback; |
| 244 | 244 |
| 245 /** | 245 /** |
| 246 * FilterEngine creation parameters. | 246 * FilterEngine creation parameters. |
| 247 */ | 247 */ |
| (...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 559 const JsValueList& param) const; | 559 const JsValueList& param) const; |
| 560 FilterPtr GetWhitelistingFilter(const std::string& url, | 560 FilterPtr GetWhitelistingFilter(const std::string& url, |
| 561 ContentTypeMask contentTypeMask, const std::string& documentUrl) const; | 561 ContentTypeMask contentTypeMask, const std::string& documentUrl) const; |
| 562 FilterPtr GetWhitelistingFilter(const std::string& url, | 562 FilterPtr GetWhitelistingFilter(const std::string& url, |
| 563 ContentTypeMask contentTypeMask, | 563 ContentTypeMask contentTypeMask, |
| 564 const std::vector<std::string>& documentUrls) const; | 564 const std::vector<std::string>& documentUrls) const; |
| 565 }; | 565 }; |
| 566 } | 566 } |
| 567 | 567 |
| 568 #endif | 568 #endif |
| OLD | NEW |