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

Delta Between Two Patch Sets: src/Notification.cpp

Issue 5598762307158016: Issue 1550 - Get rid of V8ValueHolder.h (Closed)
Left Patch Set: fix JsValue destructor Created Jan. 22, 2016, 1:16 p.m.
Right Patch Set: rebase Created May 20, 2016, 3:20 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « src/JsValue.cpp ('k') | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 Notification::Notification(JsValue&& jsValue) 60 Notification::Notification(JsValue&& jsValue)
61 : JsValue(std::move(jsValue)) 61 : JsValue(std::move(jsValue))
62 { 62 {
63 } 63 }
64 64
65 NotificationType Notification::GetType() const 65 NotificationType Notification::GetType() const
66 { 66 {
67 return StringToNotificationType(GetProperty("type")->AsString()); 67 return StringToNotificationType(GetProperty("type")->AsString());
68 } 68 }
69 69
70 NotificationTexts Notification::GetTexts() 70 NotificationTexts Notification::GetTexts() const
71 { 71 {
72 JsValueList params; 72 JsValuePtr jsTexts = jsEngine->Evaluate("API.getNotificationTexts")->Call(*thi s);
73 params.push_back(shared_from_this());
74 JsValuePtr jsTexts = jsEngine->Evaluate("API.getNotificationTexts")->Call(para ms);
75 NotificationTexts notificationTexts; 73 NotificationTexts notificationTexts;
76 JsValuePtr jsTitle = jsTexts->GetProperty("title"); 74 JsValuePtr jsTitle = jsTexts->GetProperty("title");
77 if (jsTitle->IsString()) 75 if (jsTitle->IsString())
78 { 76 {
79 notificationTexts.title = jsTitle->AsString(); 77 notificationTexts.title = jsTitle->AsString();
80 } 78 }
81 JsValuePtr jsMessage = jsTexts->GetProperty("message"); 79 JsValuePtr jsMessage = jsTexts->GetProperty("message");
82 if (jsMessage->IsString()) 80 if (jsMessage->IsString())
83 { 81 {
84 notificationTexts.message = jsMessage->AsString(); 82 notificationTexts.message = jsMessage->AsString();
(...skipping 13 matching lines...) Expand all
98 for (JsValueList::const_iterator linkIterator = urlLinksList.begin(); 96 for (JsValueList::const_iterator linkIterator = urlLinksList.begin();
99 linkIterator != urlLinksList.end(); ++linkIterator) 97 linkIterator != urlLinksList.end(); ++linkIterator)
100 { 98 {
101 retValue.push_back((*linkIterator)->AsString()); 99 retValue.push_back((*linkIterator)->AsString());
102 } 100 }
103 return retValue; 101 return retValue;
104 } 102 }
105 103
106 void Notification::MarkAsShown() 104 void Notification::MarkAsShown()
107 { 105 {
108 JsValueList params; 106 jsEngine->Evaluate("API.markNotificationAsShown")->Call(*GetProperty("id"));
109 params.push_back(GetProperty("id"));
110 jsEngine->Evaluate("API.markNotificationAsShown")->Call(params);
111 } 107 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld