Issue 1550 - Get rid of V8ValueHolder.h

include/AdblockPlus/Notification.h

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2015 Eyeo GmbH
+ * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef ADBLOCK_PLUS_NOTIFICATION_H
 #define ADBLOCK_PLUS_NOTIFICATION_H
 
 #include <string>
 #include <vector>
-#include "tr1_memory.h"
+#include <memory>
 
 namespace AdblockPlus
 {
   class FilterEngine;
   /**
    * Possible notification types.
    */
   enum NotificationType
   {
     NOTIFICATION_TYPE_INFORMATION,
     NOTIFICATION_TYPE_QUESTION,
     NOTIFICATION_TYPE_CRITICAL
   };
 
   /**
+   * Contains notification title and message. It's returned by
+   * `Notification::GetTexts`.
+   */
+  struct NotificationTexts
+  {
+    std::string title;
+    std::string message;
+  };
+
+  /**
    * Wrapper for an Adblock Plus notification object.
    */
-  class Notification: public JsValue
+  class Notification: public JsValue,
+                      public std::enable_shared_from_this<Notification>
   {
     friend class FilterEngine;
   protected:
-    static std::tr1::shared_ptr<Notification> JsValueToNotification(JsValue&& jsValue);
     /**
      * Constructor.
-     * @param jsValue `JsValuePtr` notification JavaScript object.
+     * @param jsValue `JsValue&&` notification JavaScript object.
      */
     explicit Notification(JsValue&& jsValue);
   public:
     /**
      * Retrieves the type of this notification.
      * @return Type of this notification.
      */
     NotificationType GetType() const;
 
     /**
-     * Retrieves the title of this notification.
-     * @return Title of this notification.
+     * Retrieves the title and message of this notification.
+     * @return Translated texts.
      */
-    const std::string& GetTitle() const;
-
-    /**
-     * Retrieves the message of this notification.
-     * @return Message of this notification.
-     */
-    const std::string& GetMessageString() const;
+    NotificationTexts GetTexts() const;
 
     /**
      * Retrieves the URLs which should be mapped to the links in the message.
      * @return List of links.
      */
     std::vector<std::string> GetLinks() const;
 
     /**
      * Marks this notification as shown. It is only relevant for question
      * notifications. Other notifications are marked automatically.
      */
     void MarkAsShown();
   private:
-    std::string title;
-    std::string message;
-    NotificationType type;
   };
-  typedef std::tr1::shared_ptr<Notification> NotificationPtr;
+  typedef std::shared_ptr<Notification> NotificationPtr;
 }
 
-#endif
+#endif