Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1436425 - Stop importing resetProfile.js when it is unneeded. r=MattN

Browse Source 
--HG--
extra : rebase_source : 5e72bed65128fa3529fc3e3b67672454e8020ab3
This commit is contained in:
Marco Castelluccio 2018-02-07 13:08:55 +01:00
parent b45fe1c443
commit 198b87d386
4 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/base/content/safeMode.js
View File

@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* import-globals-from ../../../toolkit/content/resetProfile.js */ ChromeUtils.import("resource://gre/modules/Services.jsm");
const appStartup = Services.startup; const appStartup = Services.startup;

1
browser/base/content/safeMode.xul
View File

@ -28,7 +28,6 @@
ondialogextra1="return onExtra1()" ondialogextra1="return onExtra1()"
onload="onLoad()"> onload="onLoad()">
<script type="application/javascript" src="chrome://global/content/resetProfile.js"/>
<script type="application/javascript" src="chrome://browser/content/safeMode.js"/> <script type="application/javascript" src="chrome://browser/content/safeMode.js"/>
<vbox id="autoSafeMode" hidden="true"> <vbox id="autoSafeMode" hidden="true">

2
toolkit/content/aboutSupport.xhtml
View File

@ -25,8 +25,6 @@
<script type="application/javascript" <script type="application/javascript"
src="chrome://global/content/aboutSupport.js"/> src="chrome://global/content/aboutSupport.js"/>
<script type="application/javascript"
src="chrome://global/content/resetProfile.js"/>
</head> </head>
<body dir="&locale.dir;"> <body dir="&locale.dir;">

10
toolkit/content/resetProfile.js
View File

@ -4,16 +4,6 @@
"use strict"; "use strict";
// NB: this file can be loaded from aboutSupport.xhtml or from the
// resetProfile.xul dialog, and so Cu may or may not exist already.
// Proceed with caution:
if (!("Cu" in window)) {
window.Cu = Components.utils;
}
ChromeUtils.import("resource://gre/modules/Services.jsm");
ChromeUtils.import("resource://gre/modules/ResetProfile.jsm");
function onResetProfileAccepted() { function onResetProfileAccepted() {
let retVals = window.arguments[0]; let retVals = window.arguments[0];
retVals.reset = true; retVals.reset = true;