Backed out changeset 9d1b8acf821d for tart crashes (bug 1026561)

This commit is contained in:
Ed Lee 2014-07-17 23:49:05 -07:00
parent e104bc7334
commit 4a29cdabe1
3 changed files with 4 additions and 9 deletions

View File

@ -1471,7 +1471,7 @@ pref("browser.newtabpage.enabled", true);
pref("browser.newtabpage.rows", 3);
// number of columns of newtab grid
pref("browser.newtabpage.columns", 8);
pref("browser.newtabpage.columns", 3);
// directory tiles download URL
pref("browser.newtabpage.directory.source", "chrome://global/content/directoryLinks.json");

View File

@ -17,8 +17,8 @@ function runTests() {
// Expected length of grid
let expectedValues = [1, 1, 1, 1, 8, 10];
// Values before setting new pref values (24 is the default value -> 8 x 3)
let previousValues = [24, 1, 1, 1, 1, 8];
// Values before setting new pref values (9 is the default value -> 3 x 3)
let previousValues = [9, 1, 1, 1, 1, 8];
let existingTab, existingTabGridLength, newTab, newTabGridLength;
yield addNewTabPageTab();

View File

@ -1,8 +1,6 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
const PREF_NEWTAB_COLUMNS = "browser.newtabpage.columns";
/*
* These tests make sure that dragging and dropping sites works as expected.
* Sites contained in the grid need to shift around to indicate the result
@ -30,11 +28,8 @@ function runTests() {
yield addNewTabPageTab();
checkGrid("0,1,2,3,4,5,6,7p,8p");
// force the grid to be small enough that a pinned cell could be pushed out
Services.prefs.setIntPref(PREF_NEWTAB_COLUMNS, 3);
yield simulateExternalDrop(7);
checkGrid("0,1,2,3,4,5,7p,99p,8p");
Services.prefs.clearUserPref(PREF_NEWTAB_COLUMNS);
// drag a new site beneath a pinned cell and make sure the pinned cell is
// not moved