Issue 2693 - Update adblockplus dependency

include/AdblockPlus/FilterEngine.h

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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
@@ skipping 168 matching lines @@
     /**
      * Callback type invoked when the filters change.
      * The first parameter is the action event code (see
      * [FilterNotifier.triggerListeners](https://adblockplus.org/jsdoc/adblockplus/symbols/FilterNotifier.html#.triggerListeners)
      * for the full list).
      * The second parameter is the filter/subscription object affected, if any.
      */
     typedef std::tr1::function<void(const std::string&, const JsValuePtr)> FilterChangeCallback;
 
     /**
+     * Callback type invoked when a new notification should be shown.
+     * The parameter is the Notification object to be shown.
+     */
+    typedef std::tr1::function<void(const NotificationPtr&)> NotificationAvailableCallback;
+
+    /**
      * Constructor.
      * @param jsEngine `JsEngine` instance used to run JavaScript code
      *        internally.
      */
     explicit FilterEngine(JsEnginePtr jsEngine);
 
     /**
      * Retrieves the `JsEngine` instance associated with this `FilterEngine`
      * instance.
      */
@@ skipping 32 matching lines @@
      */
     std::vector<SubscriptionPtr> GetListedSubscriptions() const;
 
     /**
      * Retrieves all recommended subscriptions.
      * @return List of recommended subscriptions.
      */
     std::vector<SubscriptionPtr> FetchAvailableSubscriptions() const;
 
     /**
-     * Determines which notification is to be shown next.
+     * Invokes the listener set via SetNotificationAvailableCallback() with the
+     * next notification to be shown.
      * @param url URL to match notifications to (optional).
-     * @return Notification to be shown, or `null` if there is no any.
      */
-    NotificationPtr GetNextNotificationToShow(
-      const std::string& url = std::string());
+    void ShowNextNotification(const std::string& url = std::string());
+
+    /**
+     * Sets the callback invoked when a notification should be shown.
+     * @param callback Callback to invoke.
+     */
+    void SetNotificationAvailableCallback(const NotificationAvailableCallback& value);

[Felix Dahlke, 2015/06/25 18:35:48]

I'd prefer to call this SetNotificationShowCallback - so we have the same
terminology in Core and Libadblockplus.

[sergei, 2015/06/26 14:21:17]

I think the callback should be called `ShowNotificationCallback` rather than
`NotificationShowCallback`, in that case it looks logical to name the method
`SetShowNotificationCallback` (it's in the updated version). Agree?

[Felix Dahlke, 2015/06/30 19:45:31]

Yeah, fair enough.

+
+    /**
+     * Removes the callback invoked when a notification should be shown.
+     * available.
+     */
+    void RemoveNotificationAvailableCallback();
 
     /**
      * Checks if any active filter matches the supplied URL.
      * @param url URL to match.
      * @param contentType Content type of the requested resource.
      * @param documentUrl URL of the document requesting the resource.
      *        Note that there will be more than one document if frames are
      *        involved, see
      *        Matches(const std::string&, const std::string&, const std::vector<std::string>&) const.
      * @return Matching filter, or `null` if there was no match.
@@ skipping 122 matching lines @@
     static const std::map<ContentType, std::string> contentTypes;
 
     void InitDone(JsValueList& params);
     FilterPtr CheckFilterMatch(const std::string& url,
                                ContentType contentType,
                                const std::string& documentUrl) const;
     void UpdateAvailable(UpdateAvailableCallback callback, JsValueList& params);
     void UpdateCheckDone(const std::string& eventName,
                          UpdateCheckDoneCallback callback, JsValueList& params);
     void FilterChanged(FilterChangeCallback callback, JsValueList& params);
+    void NotificationAvailable(const NotificationAvailableCallback& callback,
+      const JsValueList& params);
   };
 }
 
 #endif