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