author | Nicholas Nethercote <nnethercote@mozilla.com> |
Tue, 06 Feb 2018 13:57:35 +1100 | |
changeset 402676 | a3612137cbd112926ff8b72cda691e3ea8db63a4 |
parent 402675 | 6ac8adb83f39278fe8e3dad9134fde133e142c62 |
child 402677 | b3a81e6e2c1e356602d08122b17ce6a4a639ef0e |
push id | 33397 |
push user | dluca@mozilla.com |
push date | Wed, 07 Feb 2018 09:58:42 +0000 |
treeherder | mozilla-central@4fe6f6560083 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | glandium |
bugs | 1435927 |
milestone | 60.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
modules/libpref/Preferences.cpp | file | annotate | diff | comparison | revisions | |
modules/libpref/nsIPrefService.idl | file | annotate | diff | comparison | revisions |
--- a/modules/libpref/Preferences.cpp +++ b/modules/libpref/Preferences.cpp @@ -3083,18 +3083,16 @@ Preferences::ReadUserPrefsFromFile(nsIFi return openPrefFile(aFile); } NS_IMETHODIMP Preferences::ResetPrefs() { ENSURE_PARENT_PROCESS("Preferences::ResetPrefs", "all prefs"); - NotifyServiceObservers(NS_PREFSERVICE_RESET_TOPIC_ID); - gHashTable->ClearAndPrepareForLength(PREF_HASHTABLE_INITIAL_LENGTH); gPrefNameArena.Clear(); return InitInitialObjects().isOk() ? NS_OK : NS_ERROR_FAILURE; } NS_IMETHODIMP Preferences::ResetUserPrefs()
--- a/modules/libpref/nsIPrefService.idl +++ b/modules/libpref/nsIPrefService.idl @@ -126,20 +126,14 @@ interface nsIPrefService : nsISupports #define NS_PREFSERVICE_CONTRACTID "@mozilla.org/preferences-service;1" /** * Notification sent before reading the default user preferences files. */ #define NS_PREFSERVICE_READ_TOPIC_ID "prefservice:before-read-userprefs" /** - * Notification sent when resetPrefs has been called, but before the actual - * reset process occurs. - */ -#define NS_PREFSERVICE_RESET_TOPIC_ID "prefservice:before-reset" - -/** * Notification sent when after reading app-provided default * preferences, but before user profile override defaults are loaded. */ #define NS_PREFSERVICE_APPDEFAULTS_TOPIC_ID "prefservice:after-app-defaults" %}