| 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-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 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 type; | 67   return type; | 
| 68 } | 68 } | 
| 69 | 69 | 
| 70 const std::string& Notification::GetTitle() const | 70 const std::string& Notification::GetTitle() const | 
| 71 { | 71 { | 
| (...skipping 22 matching lines...) Expand all  Loading... | 
| 94   return retValue; | 94   return retValue; | 
| 95 } | 95 } | 
| 96 | 96 | 
| 97 void Notification::MarkAsShown() | 97 void Notification::MarkAsShown() | 
| 98 { | 98 { | 
| 99   JsValueList params; | 99   JsValueList params; | 
| 100   params.push_back(GetProperty("id")); | 100   params.push_back(GetProperty("id")); | 
| 101   jsEngine->Evaluate("API.markNotificationAsShown")->Call(params); | 101   jsEngine->Evaluate("API.markNotificationAsShown")->Call(params); | 
| 102 } | 102 } | 
| 103 | 103 | 
| 104 NotificationPtr Notification::JsValueToNotification(const JsValuePtr& jsValue) | 104 NotificationPtr Notification::JsValueToNotification(JsValue&& jsValue) | 
| 105 { | 105 { | 
| 106   if (!jsValue || !jsValue->IsObject()) | 106   if (!jsValue.IsObject()) | 
| 107   { | 107   { | 
| 108     return NotificationPtr(); | 108     return NotificationPtr(); | 
| 109   } | 109   } | 
| 110 | 110 | 
| 111   NotificationPtr notification(new Notification(jsValue)); | 111   NotificationPtr notification(new Notification(std::move(jsValue))); | 
| 112   JsValuePtr jsType = notification->GetProperty("type"); | 112   JsValuePtr jsType = notification->GetProperty("type"); | 
| 113   notification->type = StringToNotificationType(jsType ? jsType->AsString() : ""
     ); | 113   notification->type = StringToNotificationType(jsType ? jsType->AsString() : ""
     ); | 
| 114 | 114 | 
| 115   JsValueList params; | 115   JsValueList params; | 
| 116   params.push_back(notification); | 116   params.push_back(notification); | 
| 117   JsValuePtr func = notification->jsEngine->Evaluate("API.getNotificationTexts")
     ; | 117   JsValuePtr func = notification->jsEngine->Evaluate("API.getNotificationTexts")
     ; | 
| 118   JsValuePtr jsTexts = func->Call(params); | 118   JsValuePtr jsTexts = func->Call(params); | 
| 119   JsValuePtr jsTitle = jsTexts->GetProperty("title"); | 119   JsValuePtr jsTitle = jsTexts->GetProperty("title"); | 
| 120   if (jsTitle->IsString()) | 120   if (jsTitle->IsString()) | 
| 121   { | 121   { | 
| 122     notification->title = jsTitle->AsString(); | 122     notification->title = jsTitle->AsString(); | 
| 123   } | 123   } | 
| 124   JsValuePtr jsMessage = jsTexts->GetProperty("message"); | 124   JsValuePtr jsMessage = jsTexts->GetProperty("message"); | 
| 125   if (jsMessage->IsString()) | 125   if (jsMessage->IsString()) | 
| 126   { | 126   { | 
| 127     notification->message = jsMessage->AsString(); | 127     notification->message = jsMessage->AsString(); | 
| 128   } | 128   } | 
| 129   return notification; | 129   return notification; | 
| 130 } | 130 } | 
| OLD | NEW | 
|---|