Bug 287885 - Error: redeclaration of const ADD_BM_DIALOG_FEATURES. r=mconnor, a=asa

browser/base/content/browser.js

@@ -57,6 +57,13 @@ const nsIWebNavigation   = nsCI.nsIWebNavigation;
 
 const MAX_HISTORY_MENU_ITEMS = 15;
 
+// bookmark dialog features
+#ifdef XP_MACOSX
+const BROWSER_ADD_BM_FEATURES = "centerscreen,chrome,dialog,resizable,modal";
+#else
+const BROWSER_ADD_BM_FEATURES = "centerscreen,chrome,dialog,resizable,dependent";
+#endif
+
 var gRDF = null;
 var gGlobalHistory = null;
 var gURIFixup = null;
@@ -1535,7 +1542,7 @@ function addBookmarkForTabBrowser(aTabBrowser, aSelect)
   var dialogArgs = currentTabInfo;
   dialogArgs.objGroup = tabsInfo;
   openDialog("chrome://browser/content/bookmarks/addBookmark2.xul", "",
-             ADD_BM_DIALOG_FEATURES, dialogArgs);
+             BROWSER_ADD_BM_FEATURES, dialogArgs);
 }
 
 function addBookmarkForBrowser(aDocShell, aIsWebPanel)
@@ -2438,7 +2445,7 @@ var bookmarksButtonObserver = {
         url: url
       }
       openDialog("chrome://browser/content/bookmarks/addBookmark2.xul", "",
-                 ADD_BM_DIALOG_FEATURES, dialogArgs);
+                 BROWSER_ADD_BM_FEATURES, dialogArgs);
     }
   },
 
@@ -4649,7 +4656,7 @@ function asyncOpenWebPanel(event)
            bWebPanel: true
          }
          openDialog("chrome://browser/content/bookmarks/addBookmark2.xul", "",
-                    ADD_BM_DIALOG_FEATURES, dialogArgs);
+                    BROWSER_ADD_BM_FEATURES, dialogArgs);
          event.preventDefault();
          return false;
        }
@@ -5486,7 +5493,7 @@ function AddKeywordForSearchField()
     description: BookmarksUtils.getDescriptionFromDocument(node.ownerDocument)
   }
   openDialog("chrome://browser/content/bookmarks/addBookmark2.xul", "",
-             ADD_BM_DIALOG_FEATURES, dialogArgs);
+             BROWSER_ADD_BM_FEATURES, dialogArgs);
 }
 
 /////////////// livemark handling

browser/base/content/utilityOverlay.js

@@ -41,13 +41,6 @@
  * for shared application glue for the Communicator suite of applications
  **/
 
-// bookmark dialog features
-#ifdef XP_MACOSX
-const ADD_BM_DIALOG_FEATURES = "centerscreen,chrome,dialog,resizable,modal";
-#else
-const ADD_BM_DIALOG_FEATURES = "centerscreen,chrome,dialog,resizable,dependent";
-#endif
-
 var goPrefWindow = 0;
 var gBidiUI = false;
 

browser/components/bookmarks/content/bookmarks.js

@@ -36,6 +36,12 @@
 #
 # ***** END LICENSE BLOCK *****
 
+#ifdef XP_MACOSX
+const ADD_BM_DIALOG_FEATURES = "centerscreen,chrome,dialog,resizable,modal";
+#else
+const ADD_BM_DIALOG_FEATURES = "centerscreen,chrome,dialog,resizable,dependent";
+#endif
+
 var gNC_NS, gWEB_NS, gRDF_NS, gXUL_NS, gNC_NS_CMD;
 
 // definition of the services frequently used for bookmarks