зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset 4b003634e1a7 (bug 1577031) for browser-chrome failures related to UITour. CLOSED TREE
This commit is contained in:
Родитель
ec62854d68
Коммит
44ad3cfc99
|
@ -371,14 +371,6 @@ if (typeof Mozilla == "undefined") {
|
||||||
_sendEvent("showNewTab");
|
_sendEvent("showNewTab");
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* Loads about:protections in the tour tab.
|
|
||||||
* @since 70
|
|
||||||
*/
|
|
||||||
Mozilla.UITour.showProtectionReport = function() {
|
|
||||||
_sendEvent("showProtectionReport");
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @typedef Mozilla.UITour.ConfigurationName
|
* @typedef Mozilla.UITour.ConfigurationName
|
||||||
* @description Valid values:<ul>
|
* @description Valid values:<ul>
|
||||||
|
|
|
@ -709,11 +709,6 @@ var UITour = {
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
case "showProtectionReport": {
|
|
||||||
this.showProtectionReport(window, browser);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// For performance reasons, only call initForBrowser if we did something
|
// For performance reasons, only call initForBrowser if we did something
|
||||||
|
@ -1559,17 +1554,6 @@ var UITour = {
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
showProtectionReport(aWindow, aBrowser) {
|
|
||||||
let url = "about:protections";
|
|
||||||
aWindow.openLinkIn(url, "current", {
|
|
||||||
targetBrowser: aBrowser,
|
|
||||||
triggeringPrincipal: Services.scriptSecurityManager.createContentPrincipal(
|
|
||||||
Services.io.newURI(url),
|
|
||||||
{}
|
|
||||||
),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
|
|
||||||
_hideAnnotationsForPanel(aEvent, aShouldClosePanel, aTargetPositionCallback) {
|
_hideAnnotationsForPanel(aEvent, aShouldClosePanel, aTargetPositionCallback) {
|
||||||
let win = aEvent.target.ownerGlobal;
|
let win = aEvent.target.ownerGlobal;
|
||||||
let hideHighlightMethod = null;
|
let hideHighlightMethod = null;
|
||||||
|
|
|
@ -38,8 +38,6 @@ skip-if = true # Disabled pending removal of pocket UI Tour
|
||||||
skip-if = (verify && !debug && (os == 'linux'))
|
skip-if = (verify && !debug && (os == 'linux'))
|
||||||
[browser_UITour_showNewTab.js]
|
[browser_UITour_showNewTab.js]
|
||||||
skip-if = (verify && !debug && (os == 'linux'))
|
skip-if = (verify && !debug && (os == 'linux'))
|
||||||
[browser_UITour_showProtectionReport.js]
|
|
||||||
skip-if = (verify && !debug && (os == 'linux'))
|
|
||||||
[browser_UITour_sync.js]
|
[browser_UITour_sync.js]
|
||||||
[browser_UITour_toggleReaderMode.js]
|
[browser_UITour_toggleReaderMode.js]
|
||||||
skip-if = (verify && !debug && (os == 'linux'))
|
skip-if = (verify && !debug && (os == 'linux'))
|
||||||
|
|
|
@ -1,28 +0,0 @@
|
||||||
/* Any copyright is dedicated to the Public Domain.
|
|
||||||
* http://creativecommons.org/publicdomain/zero/1.0/ */
|
|
||||||
|
|
||||||
"use strict";
|
|
||||||
|
|
||||||
var gTestTab;
|
|
||||||
var gContentAPI;
|
|
||||||
var gContentWindow;
|
|
||||||
|
|
||||||
add_task(setup_UITourTest);
|
|
||||||
|
|
||||||
// Test that we can switch to about:protections
|
|
||||||
add_UITour_task(async function test_openProtectionReport() {
|
|
||||||
let aboutProtectionsLoaded = BrowserTestUtils.browserLoaded(
|
|
||||||
gBrowser.selectedBrowser,
|
|
||||||
false,
|
|
||||||
"about:protections"
|
|
||||||
);
|
|
||||||
info("Showing about:protections");
|
|
||||||
await gContentAPI.showProtectionReport();
|
|
||||||
info("Waiting for about:protections to load");
|
|
||||||
await aboutProtectionsLoaded;
|
|
||||||
is(
|
|
||||||
gBrowser.selectedBrowser.currentURI.spec,
|
|
||||||
"about:protections",
|
|
||||||
"Loaded about:protections"
|
|
||||||
);
|
|
||||||
});
|
|
Загрузка…
Ссылка в новой задаче