Bug 1560475 - Do not load AccountManager.js into msgAccountCentral.js. r=darktrojan

mailnews/base/content/msgAccountCentral.js

@@ -4,7 +4,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* import-globals-from ../../../mail/base/content/mailCore.js */
-/* import-globals-from ../prefs/content/AccountManager.js */
 /* import-globals-from ../prefs/content/accountUtils.js */
 
 var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
@@ -278,13 +277,13 @@ function CreateNewAccount() {
 
 function CreateNewAccountTB(type) {
   if (type == "mail") {
-  AddMailAccount();
-  return;
+    AddMailAccount();
+    return;
   }
 
   if (type == "feeds") {
-  AddFeedAccount();
-  return;
+    AddFeedAccount();
+    return;
   }
 
   window.parent.msgOpenAccountWizard(

mailnews/base/content/msgAccountCentral.xul

@@ -23,7 +23,6 @@
                 src="chrome://messenger/locale/messenger.properties"/>
   <stringbundle id="bundle_prefs"
                 src="chrome://messenger/locale/prefs.properties"/>
-  <script src="chrome://messenger/content/AccountManager.js"/>
   <script src="chrome://messenger/content/accountUtils.js"/>
   <script src="chrome://messenger/content/commandglue.js"/>
   <script src="chrome://messenger/content/mailWindowOverlay.js"/>

mailnews/base/prefs/content/AccountManager.js

@@ -716,15 +716,6 @@ function onAddAccount() {
   MsgAccountWizard();
 }
 
-function AddMailAccount() {
-  NewMailAccount(MailServices.mailSession.topmostMsgWindow);
-}
-
-function AddIMAccount() {
-  window.openDialog("chrome://messenger/content/chat/imAccountWizard.xul",
-                    "", "chrome,modal,titlebar,centerscreen");
-}
-
 /**
  * Highlight the default account row in the account tree,
  * optionally un-highlight the previous one.

mailnews/base/prefs/content/accountUtils.js

@@ -208,6 +208,16 @@ function initAccountWizardTB(args) {
   }
 }
 
+function AddMailAccount() {
+  NewMailAccount(MailServices.mailSession.topmostMsgWindow);
+}
+
+function AddIMAccount() {
+  window.openDialog("chrome://messenger/content/chat/imAccountWizard.xul",
+                    "", "chrome,modal,titlebar,centerscreen");
+}
+
+
 function AddFeedAccount() {
   window.openDialog("chrome://messenger-newsblog/content/feedAccountWizard.xul",
                     "", "chrome,modal,titlebar,centerscreen");