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: rebase Created Aug. 3, 2015, 8:28 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-2015 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
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 } 57 }
58 } 58 }
59 59
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 type; 67 return StringToNotificationType(GetProperty("type")->AsString());
68 } 68 }
69 69
70 const std::string& Notification::GetTitle() const 70 NotificationTexts Notification::GetTexts() const
71 { 71 {
72 return title; 72 JsValuePtr jsTexts = jsEngine->Evaluate("API.getNotificationTexts")->Call(*thi s);
73 } 73 NotificationTexts notificationTexts;
74 74 JsValuePtr jsTitle = jsTexts->GetProperty("title");
75 const std::string& Notification::GetMessageString() const 75 if (jsTitle->IsString())
76 { 76 {
77 return message; 77 notificationTexts.title = jsTitle->AsString();
78 }
79 JsValuePtr jsMessage = jsTexts->GetProperty("message");
80 if (jsMessage->IsString())
81 {
82 notificationTexts.message = jsMessage->AsString();
83 }
84 return notificationTexts;
78 } 85 }
79 86
80 std::vector<std::string> Notification::GetLinks() const 87 std::vector<std::string> Notification::GetLinks() const
81 { 88 {
82 std::vector<std::string> retValue; 89 std::vector<std::string> retValue;
83 JsValuePtr jsLinks = GetProperty("links"); 90 JsValuePtr jsLinks = GetProperty("links");
84 if (!jsLinks->IsArray()) 91 if (!jsLinks->IsArray())
85 { 92 {
86 return retValue; 93 return retValue;
87 } 94 }
88 JsValueList urlLinksList = jsLinks->AsList(); 95 JsValueList urlLinksList = jsLinks->AsList();
89 for (JsValueList::const_iterator linkIterator = urlLinksList.begin(); 96 for (JsValueList::const_iterator linkIterator = urlLinksList.begin();
90 linkIterator != urlLinksList.end(); ++linkIterator) 97 linkIterator != urlLinksList.end(); ++linkIterator)
91 { 98 {
92 retValue.push_back((*linkIterator)->AsString()); 99 retValue.push_back((*linkIterator)->AsString());
93 } 100 }
94 return retValue; 101 return retValue;
95 } 102 }
96 103
97 void Notification::MarkAsShown() 104 void Notification::MarkAsShown()
98 { 105 {
99 JsValueList params; 106 jsEngine->Evaluate("API.markNotificationAsShown")->Call(*GetProperty("id"));
100 params.push_back(GetProperty("id"));
101 jsEngine->Evaluate("API.markNotificationAsShown")->Call(params);
102 }
103
104 NotificationPtr Notification::JsValueToNotification(JsValue&& jsValue)
105 {
106 if (!jsValue.IsObject())
107 {
108 return NotificationPtr();
109 }
110
111 NotificationPtr notification(new Notification(std::move(jsValue)));
112 JsValuePtr jsType = notification->GetProperty("type");
113 notification->type = StringToNotificationType(jsType ? jsType->AsString() : "" );
114
115 JsValueList params;
116 params.push_back(notification);
117 JsValuePtr func = notification->jsEngine->Evaluate("API.getNotificationTexts") ;
118 JsValuePtr jsTexts = func->Call(params);
119 JsValuePtr jsTitle = jsTexts->GetProperty("title");
120 if (jsTitle->IsString())
121 {
122 notification->title = jsTitle->AsString();
123 }
124 JsValuePtr jsMessage = jsTexts->GetProperty("message");
125 if (jsMessage->IsString())
126 {
127 notification->message = jsMessage->AsString();
128 }
129 return notification;
130 } 107 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld