OLD | NEW |
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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 NotificationTypes::const_iterator notificationTypeIterator = std::find_if( | 50 NotificationTypes::const_iterator notificationTypeIterator = std::find_if( |
51 notificationTypes.begin(), notificationTypes.end(), findBySecond); | 51 notificationTypes.begin(), notificationTypes.end(), findBySecond); |
52 if (notificationTypeIterator == notificationTypes.end()) | 52 if (notificationTypeIterator == notificationTypes.end()) |
53 { | 53 { |
54 return NotificationType::NOTIFICATION_TYPE_INFORMATION; | 54 return NotificationType::NOTIFICATION_TYPE_INFORMATION; |
55 } | 55 } |
56 return notificationTypeIterator->first; | 56 return notificationTypeIterator->first; |
57 } | 57 } |
58 } | 58 } |
59 | 59 |
60 Notification::Notification(const JsValuePtr& jsValue) | 60 Notification::Notification(JsValue&& jsValue) |
61 : JsValue(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() const | 70 NotificationTexts Notification::GetTexts() const |
71 { | 71 { |
(...skipping 26 matching lines...) Expand all Loading... |
98 { | 98 { |
99 retValue.push_back((*linkIterator)->AsString()); | 99 retValue.push_back((*linkIterator)->AsString()); |
100 } | 100 } |
101 return retValue; | 101 return retValue; |
102 } | 102 } |
103 | 103 |
104 void Notification::MarkAsShown() | 104 void Notification::MarkAsShown() |
105 { | 105 { |
106 jsEngine->Evaluate("API.markNotificationAsShown")->Call(*GetProperty("id")); | 106 jsEngine->Evaluate("API.markNotificationAsShown")->Call(*GetProperty("id")); |
107 } | 107 } |
OLD | NEW |