Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: src/FilterEngine.cpp

Issue 4904655779790848: Issue 1107.update1 - read Notification properties (title, message and type) on the fly (Closed)
Patch Set: rebase Created Nov. 4, 2015, 9:22 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « include/AdblockPlus/Notification.h ('k') | src/Notification.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 JsValuePtr item(params.size() >= 2 ? params[1] : jsEngine->NewValue(false)); 439 JsValuePtr item(params.size() >= 2 ? params[1] : jsEngine->NewValue(false));
440 callback(action, item); 440 callback(action, item);
441 } 441 }
442 442
443 void FilterEngine::ShowNotification(const ShowNotificationCallback& callback, 443 void FilterEngine::ShowNotification(const ShowNotificationCallback& callback,
444 const JsValueList& params) 444 const JsValueList& params)
445 { 445 {
446 if (params.size() < 1) 446 if (params.size() < 1)
447 return; 447 return;
448 448
449 callback(Notification::JsValueToNotification(params[0])); 449 if (!params[0]->IsObject())
450 {
451 return;
452 }
453 callback(NotificationPtr(new Notification(params[0])));
450 } 454 }
451 455
452 456
453 int FilterEngine::CompareVersions(const std::string& v1, const std::string& v2) 457 int FilterEngine::CompareVersions(const std::string& v1, const std::string& v2)
454 { 458 {
455 JsValueList params; 459 JsValueList params;
456 params.push_back(jsEngine->NewValue(v1)); 460 params.push_back(jsEngine->NewValue(v1));
457 params.push_back(jsEngine->NewValue(v2)); 461 params.push_back(jsEngine->NewValue(v2));
458 JsValuePtr func = jsEngine->Evaluate("API.compareVersions"); 462 JsValuePtr func = jsEngine->Evaluate("API.compareVersions");
459 return func->Call(params)->AsInt(); 463 return func->Call(params)->AsInt();
460 } 464 }
OLDNEW
« no previous file with comments | « include/AdblockPlus/Notification.h ('k') | src/Notification.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld