Applied changes from emailed code review

lib/appIntegration.js

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Extensions like Tab Mix Plus will try to recompile our handlers and fail
 // badly - they manage to replace our handler but the recompiled version
 // won't work because the closure is missing its variables. We replace
 // toString() function to prevent this kind of recompiling on earlier stages
 // (produce a syntax error but still leave the source code viewable).
 function doNotRecompile()
@@ skipping 42 matching lines @@
         urlbar.handleCommand.toString = doNotRecompile;
       }
     };
 
     exports.removeFromWindow = function(window)
     {
       let urlbar = exports.getURLBar(window);
       if (urlbar && urlbar.handleCommand && "urlfixerOldHandler" in urlbar.handleCommand)
         urlbar.handleCommand = urlbar.handleCommand.urlfixerOldHandler;
     };
+    
+    exports.openInfobar = function(window, id, message, buttons, persistence)
+    {
+      let browser = exports.getBrowser(window);
+      let infobar = browser.getNotificationBox();
+      let notif = infobar.getNotificationWithValue(id);

[Wladimir Palant, 2012/09/28 09:29:34]

As mentioned before - you don't need to save characters in an extension and your
editor has autocomplete. So nothing wrong with writing out "notification".

+      
+      if (notif)
+      {
+        infobar.removeNotification(notif);
+      }
+      
+      notif = infobar.appendNotification(
+        message,
+        id,
+        require("info").addonRoot + "icon64.png",
+        infobar.PRIORITY_INFO_HIGH,
+        buttons
+      );
+      notif.persistence = persistence;
+    };
+    
+    exports.loadURI = function(uri)
+    {
+      exports.getBrowser(Services.wm.getMostRecentWindow("navigator:browser")).loadURI(uri);

[Wladimir Palant, 2012/09/28 09:29:34]

This will load the address in *some* browser window which is not necessarily the
one we want. It's bad enough that we don't specify the tab - but assuming that
the right tab is selected when the user clicks a notification button isn't
unreasonable. We should pass the window as a parameter explicitly however.

(Note that this issue was addressed in one of my changes)

+    };
 
     break;
   }
   case "seamonkey":
   {
     // SeaMonkey
     exports.isKnownWindow = function(window) window.document.documentElement.getAttribute("windowtype") == "navigator:browser";
 
     exports.getURLBar = function(window) "gURLBar" in window ? window.gURLBar : null;
 
@@ skipping 26 matching lines @@
         window.handleURLBarCommand.urlfixerOldHandler = oldHandler;
         window.handleURLBarCommand.toString = doNotRecompile;
       }
     };
 
     exports.removeFromWindow = function(window)
     {
       if (window.handleURLBarCommand && "urlfixerOldHandler" in window.handleURLBarCommand)
         window.handleURLBarCommand = window.handleURLBarCommand.urlfixerOldHandler;
     };
+    
+    exports.openInfobar = function(window, id, message, buttons, persistence)
+    {
+      let browser = exports.getBrowser(window);
+      let infobar = browser.getNotificationBox();
+      let notif = infobar.getNotificationWithValue(id);
+      
+      if (notif)
+      {
+        infobar.removeNotification(notif);
+      }
+      
+      notif = infobar.appendNotification(
+        message,
+        id,
+        require("info").addonRoot + "icon64.png",
+        infobar.PRIORITY_INFO_HIGH,
+        buttons
+      );
+      notif.persistence = persistence;
+    };
+    
+    exports.loadURI = function(uri)
+    {
+      exports.getBrowser(Services.wm.getMostRecentWindow("navigator:browser")).loadURI(uri);
+    };
 
     break;
   }
   case "fennec":
   {
     // XUL Fennec
     exports.isKnownWindow = function(window) window.document.documentElement.getAttribute("windowtype") == "navigator:browser";
 
     exports.getURLBar = function(window) null;
 
@@ skipping 26 matching lines @@
         window.BrowserUI.goToURI.urlfixerOldHandler = oldHandler;
         window.BrowserUI.goToURI.toString = doNotRecompile;
       }
     };
 
     exports.removeFromWindow = function(window)
     {
       if ("BrowserUI" in window && window.BrowserUI.goToURI && "urlfixerOldHandler" in window.BrowserUI.goToURI)
         window.BrowserUI.goToURI = window.BrowserUI.goToURI.urlfixerOldHandler;
     };
+    
+    exports.openInfobar = function()
+    {
+      // TODO: Implement infobar
+    };
+    
+    exports.loadURI = function(window, uri)
+    {
+      // TODO: Implement infobar
+    };
 
     break;
   }
   case "fennec2":
   {
     // Native Fennec
     exports.isKnownWindow = function(window) window.document.documentElement.getAttribute("windowtype") == "navigator:browser";
 
     exports.getURLBar = function(window) null;
 
@@ skipping 54 matching lines @@
         window.BrowserApp.observe.urlfixerOldHandler = oldHandler;
         window.BrowserApp.observe.toString = doNotRecompile;
       }
     };
 
     exports.removeFromWindow = function(window)
     {
       if ("BrowserApp" in window && window.BrowserApp.observe && "urlfixerOldHandler" in window.BrowserApp.observe)
         window.BrowserApp.observe = window.BrowserApp.observe.urlfixerOldHandler;
     };
+    
+    exports.openInfobar = function(window, id, message, buttons, persistence)
+    {
+      if ("BrowserApp" in window && "selectedTab" in window.BrowserApp)
+      {
+        window.NativeWindow.doorhanger.show(message, id, buttons, window.BrowserApp.selectedTab.id,
+          {
+            persistence: persistence
+          }
+        );
+      }
+    };
+    
+    exports.loadURI = function(uri)
+    {
+      let window = Services.wm.getMostRecentWindow("navigator:browser");
+      if ("BrowserApp" in window && "loadURI" in window.BrowserApp)
+        window.BrowserApp.loadURI(uri);
+    };
 
     break;
   }
   default:
   {
     exports.isKnownWindow = function(window) false;
     break;
   }
 }