Left: | ||
Right: |
LEFT | RIGHT |
---|---|
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-2015 Eyeo GmbH | 3 * Copyright (C) 2006-2015 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 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
250 std::vector<SubscriptionPtr> FilterEngine::FetchAvailableSubscriptions() const | 250 std::vector<SubscriptionPtr> FilterEngine::FetchAvailableSubscriptions() const |
251 { | 251 { |
252 JsValuePtr func = jsEngine->Evaluate("API.getRecommendedSubscriptions"); | 252 JsValuePtr func = jsEngine->Evaluate("API.getRecommendedSubscriptions"); |
253 JsValueList values = func->Call()->AsList(); | 253 JsValueList values = func->Call()->AsList(); |
254 std::vector<SubscriptionPtr> result; | 254 std::vector<SubscriptionPtr> result; |
255 for (JsValueList::iterator it = values.begin(); it != values.end(); it++) | 255 for (JsValueList::iterator it = values.begin(); it != values.end(); it++) |
256 result.push_back(SubscriptionPtr(new Subscription(*it))); | 256 result.push_back(SubscriptionPtr(new Subscription(*it))); |
257 return result; | 257 return result; |
258 } | 258 } |
259 | 259 |
260 std::tr1::shared_ptr<Notification> FilterEngine::GetNextNotificationToShow(const std::string& url /*= std::string()*/) | 260 NotificationPtr FilterEngine::GetNextNotificationToShow(const std::string& url) |
Felix Dahlke
2015/01/23 13:25:55
Not a fan of that comment - this kind of stuff ten
sergei
2015/01/23 14:48:19
removed
| |
261 { | 261 { |
262 JsValuePtr func = jsEngine->Evaluate("API.getNextNotificationToShow"); | 262 JsValuePtr func = jsEngine->Evaluate("API.getNextNotificationToShow"); |
263 JsValueList params; | 263 JsValueList params; |
264 if (!url.empty()) | 264 if (!url.empty()) |
265 { | 265 { |
266 params.push_back(jsEngine->NewValue(url)); | 266 params.push_back(jsEngine->NewValue(url)); |
267 } | 267 } |
268 return Notification::JsValueToNotification(func->Call(params)); | 268 return Notification::JsValueToNotification(func->Call(params)); |
269 } | 269 } |
270 | 270 |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
415 } | 415 } |
416 | 416 |
417 int FilterEngine::CompareVersions(const std::string& v1, const std::string& v2) | 417 int FilterEngine::CompareVersions(const std::string& v1, const std::string& v2) |
418 { | 418 { |
419 JsValueList params; | 419 JsValueList params; |
420 params.push_back(jsEngine->NewValue(v1)); | 420 params.push_back(jsEngine->NewValue(v1)); |
421 params.push_back(jsEngine->NewValue(v2)); | 421 params.push_back(jsEngine->NewValue(v2)); |
422 JsValuePtr func = jsEngine->Evaluate("API.compareVersions"); | 422 JsValuePtr func = jsEngine->Evaluate("API.compareVersions"); |
423 return func->Call(params)->AsInt(); | 423 return func->Call(params)->AsInt(); |
424 } | 424 } |
LEFT | RIGHT |