Bug 987565 - Disable newtab intro feature for in tabs.js. r=aeftimie
authorAndreea Matei <andreea.matei@softvision.ro>
Thu, 25 Sep 2014 13:52:00 +0300 (2014-09-25)
changeset 4203 728f48e975df4dcebb4d1265150ee901730cae73
parent 4202 cf3e3bcdf350b42da64d4e9cf2a60241e65b1f7e
child 4204 f17ca5e4fae981276dd656e97db0691ee1b80bc6
push id3770
push userandrei.eftimie@softvision.ro
push dateFri, 03 Oct 2014 12:12:03 +0000 (2014-10-03)
reviewersaeftimie
bugs987565
Bug 987565 - Disable newtab intro feature for in tabs.js. r=aeftimie
firefox/lib/tabs.js
firefox/tests/endurance/manifest.ini
--- a/firefox/lib/tabs.js
+++ b/firefox/lib/tabs.js
@@ -37,16 +37,18 @@ var animationObserver = {
 
 // Include required modules
 var { assert } = require("../../lib/assertions");
 var domUtils = require("../../lib/dom-utils");
 var prefs = require("prefs");
 var sessionStore = require("../lib/sessionstore");
 var utils = require("../../lib/utils");
 
+const PREF_NEWTAB_INTRO = "browser.newtabpage.introShown";
+
 const TABS_VIEW = '/id("main-window")/id("tab-view-deck")/[0]';
 const TABS_BROWSER = TABS_VIEW + utils.australis.getElement("tabs") +
                      '/id("browser")/id("appcontent")/id("content")';
 const TABS_TOOLBAR = TABS_VIEW + '/id("navigator-toolbox")/id("TabsToolbar")';
 const TABS_TABS = TABS_TOOLBAR + '/id("tabbrowser-tabs")';
 const TABS_ARROW_SCROLLBOX = TABS_TABS + '/anon({"anonid":"arrowscrollbox"})';
 const TABS_STRIP = TABS_ARROW_SCROLLBOX + '/anon({"anonid":"scrollbox"})/anon({"flex":"1"})';
 
@@ -414,16 +416,20 @@ findBar.prototype = {
  */
 function tabBrowser(aController) {
   this._controller = aController;
   this.findBar = new findBar(this);
   this._tabs = this.getElement({type: "tabs"});
   let tabsScrollButton = this.getElement({type: "tabs_scrollButton",
                                           subtype: "down"});
   animationObserver.init(tabsScrollButton);
+
+  // Bug 1076870
+  // TODO: Remove this pref once it has been added in Mozmill
+  prefs.preferences.setPref(PREF_NEWTAB_INTRO, true);
 }
 
 /**
  * Tabbed Browser class
  */
 tabBrowser.prototype = {
   /**
    * Returns the MozMill controller
--- a/firefox/tests/endurance/manifest.ini
+++ b/firefox/tests/endurance/manifest.ini
@@ -1,17 +1,16 @@
 [DEFAULT]
 server-root = ../../../data
 
 [include:testAddons_OpenAndCloseExtensionList/manifest.ini]
 [include:testAddons_OpenAndCloseGetAddonsPane/manifest.ini]
 [include:testBackForwardNavigation/manifest.ini]
 [include:testBookmarks_AddAndRemoveBookmarkViaAwesomeBar/manifest.ini]
 [include:testBookmarks_OpenAllInTabs/manifest.ini]
-disabled = Bug 987565 - Test failure "controller.waitForPageLoad"
 [include:testBookmarks_OpenAndClose/manifest.ini]
 [include:testFlash_SWFVideoEmbed/manifest.ini]
 [include:testFlash_SWFVideoIframe/manifest.ini]
 [include:testFlash_SWFVideoObject/manifest.ini]
 [include:testFlash_SWFVideoURL/manifest.ini]
 [include:testPrivateBrowsing_OpenAndClose/manifest.ini]
 [include:testTabView_OpenNewTab/manifest.ini]
 [include:testTabView_OpenTabViewWithTabs/manifest.ini]