Fix toolbar icon customization in Australis

lib/appSupport.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 48 matching lines @@
 }
 
 
 /**
  * The ID (or a list of possible IDs) of the content area context menu.
  * @type String|String[]
  */
 exports.contentContextMenu = null;
 
 /**
- * The properties parent, before, after determine the default placement of the
- * toolbar icon, the property isAddonBar indicates that it is an add-on bar
- * (different options text is displayed then).
+ * Determines the default placement of the toolbar icon via object properties
+ * parent, before and after.
  * @type Object
  */
 exports.defaultToolbarPosition = null;
 
 /**
  * The properties parent, before, after determine the placement of the status
  * bar icon.
  * @type Object
  */
 exports.statusbarPosition = null;
@@ skipping 188 matching lines @@
     {
       if (event)
         window.openNewTabWith(url, exports.getBrowser(window).contentDocument, null, event, false);
       else
         window.gBrowser.loadOneTab(url, {inBackground: false});
     };
 
     exports.contentContextMenu = "contentAreaContextMenu";
 
     exports.defaultToolbarPosition = {
-      parent: "addon-bar",
-      before: "addonbar-closebutton",
-      isAddonBar: true
+      parent: "nav-bar"
     };
 
     exports.toolsMenu = {
       parent: "menu_ToolsPopup"
     };
 
     exports.addBottomBar = function fx_addBottomBar(window, element)
     {
       let bar = _addBottomBar(window, window.document.getElementById("appcontent"), element);
       if (bar)
@@ skipping 623 matching lines @@
     {
       let dialogTitle = this.overlay.attributes.subscriptionDialogTitle;
       let dialogMessage = this.overlay.attributes.subscriptionDialogMessage.replace(/\?1\?/, title).replace(/\?2\?/, url);
       if (Utils.confirm(window, dialogMessage, dialogTitle))
         this.setSubscription(url, title);
     };
 
     break;
   }
 }