Unused icons for Chrome/Safari builds

background.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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 327 matching lines @@
     {
       var notification = webkitNotifications.createHTMLNotification("notification.html");
       notification.show();
       notification.addEventListener("close", prepareNotificationIconAndPopup, false);
       return;
     }
     
     var texts = Notification.getLocalizedTexts(notification);
     var title = texts.title || "";
     var message = texts.message ? texts.message.replace(/<\/?(a|strong)>/g, "") : "";
-    var iconUrl = ext.getURL("icons/abp-128.png");
     var hasLinks = activeNotification.links && activeNotification.links.length > 0;
+    var iconUrl;
+    if (require("info").platform == "chromium")
+      iconUrl = ext.getURL("icons/abp-128.png");
+    else
+      iconUrl = ext.getURL("icon.png");

[Sebastian Noack, 2014/03/13 15:55:14]

This shouldn't be necessary. The code below that uses iconUrl, is only used on
Chrome.

[saroyanm, 2014/03/13 16:01:19]

iconUrl is also used to generate webkit notification on line 384:
var notification = webkitNotifications.createNotification(iconUrl, title,
message);
Seams like this part of code is also used in safari build.

[Sebastian Noack, 2014/03/13 16:20:00]

In that case I would prefer to keep that image redundant rather than requiring
this special case here.

[saroyanm, 2014/03/13 16:31:19]

I see your point, in that case if you are okey with other changes then we can go
with patch #1.
Or we can think about better solution, like having icon.png in chrome as well in
root directory ?

[Sebastian Noack, 2014/03/13 16:36:43]

Yep, considering my assumptions were wrong, the patch set #1 LGTM.

+    
     // Chrome on Linux does not fully support chrome.notifications yet 
     // https://code.google.com/p/chromium/issues/detail?id=291485
     if (require("info").platform == "chromium" && 
         "notifications" in chrome && 
         navigator.platform.indexOf("Linux") == -1)
     {
       var opts = {
         type: "basic",
         title: title,
         message: message,
@@ skipping 136 matching lines @@
   tab.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(tab);
 });
 
 setTimeout(function()
 {
   var notificationToShow = Notification.getNextToShow();
   if (notificationToShow)
     showNotification(notificationToShow);
 }, 3 * 60 * 1000);