|
@@ -2,7 +2,7 @@
|
|
|
# User Mark Banner <standard8@mozilla.com>
|
|
|
# Date 1507733031 -3600
|
|
|
# Node ID c072884b1b905a6e00f756c7d3697df3447e7b63
|
|
|
-# Parent fe1bf993db306dd55c9d7942e30fa9cd92e750dd
|
|
|
+# Parent 35f7b19b0acf26f198ac94fc1cf6bbc337ed2975
|
|
|
Bug 1230373 - Enable mozilla/use-services for browser/components/ r=mossop
|
|
|
|
|
|
MozReview-Commit-ID: 9m9iss3jUJJ
|
|
@@ -28,7 +28,7 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
|
|
|
// Constants & Enumeration Values
|
|
|
const TYPE_MAYBE_FEED = "application/vnd.mozilla.maybe.feed";
|
|
|
const TYPE_MAYBE_VIDEO_FEED = "application/vnd.mozilla.maybe.video.feed";
|
|
|
-@@ -104,31 +103,25 @@ var gMainPane = {
|
|
|
+@@ -117,31 +116,25 @@ var gMainPane = {
|
|
|
// Convenience & Performance Shortcuts
|
|
|
|
|
|
// These get defined by init().
|
|
@@ -60,7 +60,7 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
|
|
|
document.getElementById(aId)
|
|
|
.addEventListener(aEventType, aCallback.bind(gMainPane));
|
|
|
}
|
|
|
-@@ -183,19 +176,17 @@ var gMainPane = {
|
|
|
+@@ -196,19 +189,17 @@ var gMainPane = {
|
|
|
this._updateUseCurrentButton();
|
|
|
window.addEventListener("focus", this._updateUseCurrentButton.bind(this));
|
|
|
|
|
@@ -81,7 +81,7 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
|
|
|
// The "closing multiple tabs" and "opening multiple tabs might slow down
|
|
|
// &brandShortName;" warnings provide options for not showing these
|
|
|
// warnings again. When the user disabled them, we provide checkboxes to
|
|
|
-@@ -341,30 +332,30 @@ var gMainPane = {
|
|
|
+@@ -354,32 +345,32 @@ var gMainPane = {
|
|
|
this._brandShortName =
|
|
|
document.getElementById("bundleBrand").getString("brandShortName");
|
|
|
this._prefsBundle = document.getElementById("bundlePreferences");
|
|
@@ -90,6 +90,8 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
|
|
|
|
|
|
// Observe preferences that influence what we display so we can rebuild
|
|
|
// the view when they change.
|
|
|
+- this._prefSvc.addObserver(PREF_SHOW_PLUGINS_IN_LIST, this);
|
|
|
+- this._prefSvc.addObserver(PREF_HIDE_PLUGINS_WITHOUT_EXTENSIONS, this);
|
|
|
- this._prefSvc.addObserver(PREF_FEED_SELECTED_APP, this);
|
|
|
- this._prefSvc.addObserver(PREF_FEED_SELECTED_WEB, this);
|
|
|
- this._prefSvc.addObserver(PREF_FEED_SELECTED_ACTION, this);
|
|
@@ -104,6 +106,8 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
|
|
|
- this._prefSvc.addObserver(PREF_AUDIO_FEED_SELECTED_WEB, this);
|
|
|
- this._prefSvc.addObserver(PREF_AUDIO_FEED_SELECTED_ACTION, this);
|
|
|
- this._prefSvc.addObserver(PREF_AUDIO_FEED_SELECTED_READER, this);
|
|
|
++ Services.prefs.addObserver(PREF_SHOW_PLUGINS_IN_LIST, this);
|
|
|
++ Services.prefs.addObserver(PREF_HIDE_PLUGINS_WITHOUT_EXTENSIONS, this);
|
|
|
+ Services.prefs.addObserver(PREF_FEED_SELECTED_APP, this);
|
|
|
+ Services.prefs.addObserver(PREF_FEED_SELECTED_WEB, this);
|
|
|
+ Services.prefs.addObserver(PREF_FEED_SELECTED_ACTION, this);
|
|
@@ -126,7 +130,7 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
|
|
|
gMainPane.onSelectionChanged);
|
|
|
setEventListener("typeColumn", "click", gMainPane.sort);
|
|
|
setEventListener("actionColumn", "click", gMainPane.sort);
|
|
|
-@@ -408,19 +399,17 @@ var gMainPane = {
|
|
|
+@@ -423,19 +414,17 @@ var gMainPane = {
|
|
|
appendSearchKeywords("browserContainersSettings", [
|
|
|
browserBundle.getString("userContextPersonal.label"),
|
|
|
browserBundle.getString("userContextWork.label"),
|
|
@@ -147,7 +151,7 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
|
|
|
initBrowserContainers() {
|
|
|
if (!Services.prefs.getBoolPref("privacy.userContext.ui.enabled")) {
|
|
|
// The browserContainersGroup element has its own internal padding that
|
|
|
-@@ -486,19 +475,17 @@ var gMainPane = {
|
|
|
+@@ -501,19 +490,17 @@ var gMainPane = {
|
|
|
createOrRemoveSpecialDevEditionFile();
|
|
|
}
|
|
|
}
|
|
@@ -168,7 +172,7 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
|
|
|
win.openUILinkIn("about:preferences#sync", "current");
|
|
|
return;
|
|
|
}
|
|
|
-@@ -627,19 +614,17 @@ var gMainPane = {
|
|
|
+@@ -642,19 +629,17 @@ var gMainPane = {
|
|
|
useCurrent.disabled = !tabs.length;
|
|
|
},
|
|
|
|
|
@@ -189,7 +193,7 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
|
|
|
tabs = win.gBrowser.visibleTabs.slice(win.gBrowser._numPinnedTabs);
|
|
|
tabs = tabs.filter(this.isNotAboutPreferences);
|
|
|
}
|
|
|
-@@ -1186,30 +1171,30 @@ var gMainPane = {
|
|
|
+@@ -1201,32 +1186,32 @@ var gMainPane = {
|
|
|
* Displays the history of installed updates.
|
|
|
*/
|
|
|
showUpdates() {
|
|
@@ -198,6 +202,8 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
|
|
|
|
|
|
destroy() {
|
|
|
window.removeEventListener("unload", this);
|
|
|
+- this._prefSvc.removeObserver(PREF_SHOW_PLUGINS_IN_LIST, this);
|
|
|
+- this._prefSvc.removeObserver(PREF_HIDE_PLUGINS_WITHOUT_EXTENSIONS, this);
|
|
|
- this._prefSvc.removeObserver(PREF_FEED_SELECTED_APP, this);
|
|
|
- this._prefSvc.removeObserver(PREF_FEED_SELECTED_WEB, this);
|
|
|
- this._prefSvc.removeObserver(PREF_FEED_SELECTED_ACTION, this);
|
|
@@ -212,6 +218,8 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
|
|
|
- this._prefSvc.removeObserver(PREF_AUDIO_FEED_SELECTED_WEB, this);
|
|
|
- this._prefSvc.removeObserver(PREF_AUDIO_FEED_SELECTED_ACTION, this);
|
|
|
- this._prefSvc.removeObserver(PREF_AUDIO_FEED_SELECTED_READER, this);
|
|
|
++ Services.prefs.removeObserver(PREF_SHOW_PLUGINS_IN_LIST, this);
|
|
|
++ Services.prefs.removeObserver(PREF_HIDE_PLUGINS_WITHOUT_EXTENSIONS, this);
|
|
|
+ Services.prefs.removeObserver(PREF_FEED_SELECTED_APP, this);
|
|
|
+ Services.prefs.removeObserver(PREF_FEED_SELECTED_WEB, this);
|
|
|
+ Services.prefs.removeObserver(PREF_FEED_SELECTED_ACTION, this);
|
|
@@ -231,10 +239,10 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
|
|
|
|
|
|
// nsISupports
|
|
|
|
|
|
- QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
|
|
|
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsIDOMEventListener]),
|
|
|
|
|
|
// nsIObserver
|
|
|
-@@ -1984,34 +1969,34 @@ var gMainPane = {
|
|
|
+@@ -2097,34 +2082,34 @@ var gMainPane = {
|
|
|
if (aHandlerApp instanceof Ci.nsIWebContentHandlerInfo)
|
|
|
return this._getIconURLForWebApp(aHandlerApp.uri);
|
|
|
|
|
@@ -272,7 +280,7 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
|
|
|
_getIconURLForSystemDefault(aHandlerInfo) {
|
|
|
// Handler info objects for MIME types on some OSes implement a property bag
|
|
|
// interface from which we can get an icon for the default app, so if we're
|
|
|
-@@ -2221,19 +2206,17 @@ var gMainPane = {
|
|
|
+@@ -2334,19 +2319,17 @@ var gMainPane = {
|
|
|
|
|
|
async displayDownloadDirPrefTask() {
|
|
|
var folderListPref = document.getElementById("browser.download.folderList");
|
|
@@ -293,7 +301,7 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
|
|
|
// When user has selected cloud storage, use value in currentDirPref to
|
|
|
// compute index to display download folder label and icon to avoid
|
|
|
// displaying blank downloadFolder label and icon on load of preferences UI
|
|
|
-@@ -2274,19 +2257,17 @@ var gMainPane = {
|
|
|
+@@ -2387,19 +2370,17 @@ var gMainPane = {
|
|
|
* the XPCOM directory service via the download manager's attribute
|
|
|
* defaultDownloadsDirectory.
|
|
|
*
|
|
@@ -314,7 +322,7 @@ diff --git a/browser/components/preferences/in-content-new/main.js b/browser/com
|
|
|
},
|
|
|
|
|
|
/**
|
|
|
-@@ -2414,19 +2395,16 @@ HandlerInfoWrapper.prototype = {
|
|
|
+@@ -2527,19 +2508,16 @@ HandlerInfoWrapper.prototype = {
|
|
|
wrappedHandlerInfo: null,
|
|
|
|
|
|
|
|
@@ -381,7 +389,7 @@ diff --git a/browser/components/preferences/in-content-new/preferences.js b/brow
|
|
|
diff --git a/browser/components/preferences/in-content-new/privacy.js b/browser/components/preferences/in-content-new/privacy.js
|
|
|
--- a/browser/components/preferences/in-content-new/privacy.js
|
|
|
+++ b/browser/components/preferences/in-content-new/privacy.js
|
|
|
-@@ -273,19 +273,17 @@ var gPrivacyPane = {
|
|
|
+@@ -289,19 +289,17 @@ var gPrivacyPane = {
|
|
|
]);
|
|
|
appendSearchKeywords("siteDataSettings", [
|
|
|
bundlePrefs.getString("siteDataSettings2.description"),
|
|
@@ -402,7 +410,7 @@ diff --git a/browser/components/preferences/in-content-new/privacy.js b/browser/
|
|
|
* Selects the right item of the Tracking Protection radiogroup.
|
|
|
*/
|
|
|
trackingProtectionReadPrefs() {
|
|
|
-@@ -533,19 +531,17 @@ var gPrivacyPane = {
|
|
|
+@@ -549,19 +547,17 @@ var gPrivacyPane = {
|
|
|
// We're performing a revert. Just let it happen.
|
|
|
return;
|
|
|
}
|
|
@@ -423,7 +431,7 @@ diff --git a/browser/components/preferences/in-content-new/privacy.js b/browser/
|
|
|
if (this._lastCheckState) {
|
|
|
autoStart.checked = "checked";
|
|
|
} else {
|
|
|
-@@ -961,22 +957,20 @@ var gPrivacyPane = {
|
|
|
+@@ -977,22 +973,20 @@ var gPrivacyPane = {
|
|
|
* Displays the "remove master password" dialog to allow the user to remove
|
|
|
* the current master password. When the dialog is dismissed, master password
|
|
|
* UI is automatically updated.
|
|
@@ -452,7 +460,7 @@ diff --git a/browser/components/preferences/in-content-new/privacy.js b/browser/
|
|
|
diff --git a/browser/components/preferences/in-content-new/sync.js b/browser/components/preferences/in-content-new/sync.js
|
|
|
--- a/browser/components/preferences/in-content-new/sync.js
|
|
|
+++ b/browser/components/preferences/in-content-new/sync.js
|
|
|
-@@ -144,19 +144,17 @@ var gSyncPane = {
|
|
|
+@@ -151,19 +151,17 @@ var gSyncPane = {
|
|
|
|
|
|
fxAccounts.promiseAccountsManageURI(this._getEntryPoint()).then(accountsManageURI => {
|
|
|
document.getElementById("verifiedManage").setAttribute("href", accountsManageURI);
|