+ merge (forgot to rebase)
authorIan Gilman <ian@iangilman.com>
Tue, 27 Jul 2010 16:20:14 -0700
changeset 50214 9517ed327dd417cd58f06fc693364679f5488579
parent 50213 767bd6d7859a2689d57e549ff2c1f619eb7ea644 (current diff)
parent 50212 ddfffce5295d34574986b576bd61c22fee310818 (diff)
child 50215 d6a355524fcb88c677b10074adf0071cd5e962ff
push id15039
push useredward.lee@engineering.uiuc.edu
push dateThu, 12 Aug 2010 19:47:36 +0000
treeherdermozilla-central@5da28c582cc7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone2.0b3pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
+ merge (forgot to rebase)
browser/base/content/tabcandy/app/ui.js
--- a/browser/base/content/tabcandy/app/ui.js
+++ b/browser/base/content/tabcandy/app/ui.js
@@ -88,28 +88,17 @@ var UIManager = {
   // ----------
   // Function: init
   // Must be called after the object is created.
   init: function() {
     try {
       Storage.init();
       TabsManager.init();
       TabMirror.init();
-      this._secondaryInit();
-    } catch(e) {
-      Utils.log(e);
-    }
-  },
 
-  // -----------
-  // Function: _secondaryInit
-  // This is the bulk of the initialization, kicked off automatically by init
-  // once the system is ready.
-  _secondaryInit: function() {
-    try {
       var self = this;
 
       this._currentTab = gBrowser.selectedTab;
 
       // ___ Dev Menu
       if (this._devMode)
         this._addDevMenu();
 
@@ -154,17 +143,17 @@ var UIManager = {
       });
     } catch(e) {
       Utils.log(e);
     }
   },
 
   // ----------
   // Function: _delayInit
-  // Called automatically by _secondaryInit once sessionstore is online.
+  // Called automatically by init once sessionstore is online.
   _delayInit : function() {
     try {
       var self = this;
 
       // ___ Storage
       var data = Storage.readUIData(gWindow);
       this._storageSanity(data);