author | Fischer.json <fischer.json@gmail.com> |
Thu, 04 Jan 2018 17:24:40 +0800 | |
changeset 718926 | d1fe44be3bc05f40f116403fd3f92d0aee02aab1 |
parent 718505 | d5f42a23909eb181274731b07e4984bfbd18557d |
child 745637 | 581451b9a5ea61b835878033b3c0450fae280822 |
push id | 95088 |
push user | bmo:fliu@mozilla.com |
push date | Thu, 11 Jan 2018 03:49:19 +0000 |
reviewers | jaws |
bugs | 1427973 |
milestone | 59.0a1 |
--- a/browser/base/content/urlbarBindings.xml +++ b/browser/base/content/urlbarBindings.xml @@ -1641,17 +1641,17 @@ file, You can obtain one at http://mozil role="link" #ifdef XP_WIN value="&urlbar.searchSuggestionsNotification.changeSettingsWin;" accesskey="&urlbar.searchSuggestionsNotification.changeSettingsWin.accesskey;" #else value="&urlbar.searchSuggestionsNotification.changeSettingsUnix;" accesskey="&urlbar.searchSuggestionsNotification.changeSettingsUnix.accesskey;" #endif - onclick="openPreferences('paneSearch');" + onclick="openPreferences('paneSearch', {origin: 'searchChangeSettings'});" control="search-suggestions-change-settings"/> </xul:hbox> </xul:deck> <xul:richlistbox anonid="richlistbox" class="autocomplete-richlistbox" flex="1"/> <xul:hbox anonid="footer"> <children/> <xul:vbox anonid="one-off-search-buttons"
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm +++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.jsm @@ -62,17 +62,17 @@ let prefHelper = async function(primary, readyPromise = Promise.resolve(); } else { readyPromise = paintPromise(browserWindow); } } else { readyPromise = TestUtils.topicObserved("sync-pane-loaded"); } - browserWindow.openPreferences(primary); + browserWindow.openPreferences(primary, {origin: "mozscreenshots"}); await readyPromise; if (customFn) { let customPaintPromise = paintPromise(browserWindow); await customFn(selectedBrowser); await customPaintPromise; }
--- a/toolkit/components/telemetry/Histograms.json +++ b/toolkit/components/telemetry/Histograms.json @@ -6560,21 +6560,21 @@ "expires_in_version": "59", "kind": "categorical", "labels": ["unknown", "searchresults", "general", "applications", "privacy", "sync", "advanced"], "releaseChannelCollection": "opt-out", "description": "Count how often each preference category is opened." }, "FX_PREFERENCES_OPENED_VIA": { "record_in_processes": ["main", "content"], - "bug_numbers": [1330315, 1420062], + "bug_numbers": [1330315, 1420062, 1427973], "alert_emails": ["jaws@mozilla.com"], "expires_in_version": "63", "kind": "categorical", - "labels": ["aboutHome", "aboutTelemetry", "browserMedia", "commandLine", "commandLineLegacy", "ContainersCommand", "contentSearch", "dataReporting", "doorhanger", "devDisconnectedAlert", "experimentsOpenPref", "fxa", "fxaSignedin", "fxaError", "offlineApps", "prefserviceDefaults", "preferencesButton", "paneSync", "storagePressure", "translationInfobar", "UITour", "menubar", "notifOpenSettings", "other", "autofillFooter", "autofillDoorhanger"], + "labels": ["aboutHome", "aboutTelemetry", "browserMedia", "commandLine", "commandLineLegacy", "ContainersCommand", "contentSearch", "dataReporting", "doorhanger", "devDisconnectedAlert", "experimentsOpenPref", "fxa", "fxaSignedin", "fxaError", "offlineApps", "prefserviceDefaults", "preferencesButton", "paneSync", "storagePressure", "translationInfobar", "UITour", "menubar", "notifOpenSettings", "other", "autofillFooter", "autofillDoorhanger", "mozscreenshots", "searchChangeSettings"], "releaseChannelCollection": "opt-out", "description":"Count how the Preferences are opened." }, "FX_PAGE_ACTION_ADDED": { "record_in_processes": ["main"], "alert_emails": ["gijs@mozilla.com"], "bug_numbers": [1393843], "expires_in_version": "64",