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

Side by Side Diff: src/Notification.cpp

Issue 29334678: Issue 3589 - Change return type of AdblockPlus::JsValue::Call from pointer to r-value object. (Closed)
Patch Set: Created Jan. 27, 2016, 11:17 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
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-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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
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()
71 { 71 {
72 JsValueList params; 72 JsValueList params;
73 params.push_back(shared_from_this()); 73 params.push_back(shared_from_this());
74 JsValuePtr jsTexts = jsEngine->Evaluate("API.getNotificationTexts")->Call(para ms); 74 JsValue jsTexts = jsEngine->Evaluate("API.getNotificationTexts")->Call(params) ;
75 NotificationTexts notificationTexts; 75 NotificationTexts notificationTexts;
76 JsValuePtr jsTitle = jsTexts->GetProperty("title"); 76 JsValuePtr jsTitle = jsTexts.GetProperty("title");
77 if (jsTitle->IsString()) 77 if (jsTitle->IsString())
78 { 78 {
79 notificationTexts.title = jsTitle->AsString(); 79 notificationTexts.title = jsTitle->AsString();
80 } 80 }
81 JsValuePtr jsMessage = jsTexts->GetProperty("message"); 81 JsValuePtr jsMessage = jsTexts.GetProperty("message");
82 if (jsMessage->IsString()) 82 if (jsMessage->IsString())
83 { 83 {
84 notificationTexts.message = jsMessage->AsString(); 84 notificationTexts.message = jsMessage->AsString();
85 } 85 }
86 return notificationTexts; 86 return notificationTexts;
87 } 87 }
88 88
89 std::vector<std::string> Notification::GetLinks() const 89 std::vector<std::string> Notification::GetLinks() const
90 { 90 {
91 std::vector<std::string> retValue; 91 std::vector<std::string> retValue;
(...skipping 10 matching lines...) Expand all
102 } 102 }
103 return retValue; 103 return retValue;
104 } 104 }
105 105
106 void Notification::MarkAsShown() 106 void Notification::MarkAsShown()
107 { 107 {
108 JsValueList params; 108 JsValueList params;
109 params.push_back(GetProperty("id")); 109 params.push_back(GetProperty("id"));
110 jsEngine->Evaluate("API.markNotificationAsShown")->Call(params); 110 jsEngine->Evaluate("API.markNotificationAsShown")->Call(params);
111 } 111 }
OLDNEW
« src/FilterEngine.cpp ('K') | « src/JsValue.cpp ('k') | test/JsValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld