diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2019-04-23 15:56:35 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2019-04-23 15:56:35 -0400 |
| commit | 325b204d2661dafd2720d3e78f47be8038871dbd (patch) | |
| tree | f649c7aa92e1d49aba43de6ebade282a8bd3da28 /toolkit/components/search | |
| parent | abe80cc31d5a40ebed743085011fbcda0c1a9a10 (diff) | |
| download | UXP-325b204d2661dafd2720d3e78f47be8038871dbd.tar UXP-325b204d2661dafd2720d3e78f47be8038871dbd.tar.gz UXP-325b204d2661dafd2720d3e78f47be8038871dbd.tar.lz UXP-325b204d2661dafd2720d3e78f47be8038871dbd.tar.xz UXP-325b204d2661dafd2720d3e78f47be8038871dbd.zip | |
Issue #1053 - Drop support Android and remove Fennec - Part 1b: Remove MOZ_FENNEC
Diffstat (limited to 'toolkit/components/search')
| -rw-r--r-- | toolkit/components/search/moz.build | 2 | ||||
| -rw-r--r-- | toolkit/components/search/nsSearchService.js | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/toolkit/components/search/moz.build b/toolkit/components/search/moz.build index 2f8b3e54c..43414963d 100644 --- a/toolkit/components/search/moz.build +++ b/toolkit/components/search/moz.build @@ -11,7 +11,7 @@ EXTRA_PP_COMPONENTS += [ 'toolkitsearch.manifest', ] -if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_FENNEC'] or CONFIG['MOZ_XULRUNNER']:
+if CONFIG['MOZ_PHOENIX'] or CONFIG['MOZ_XULRUNNER']:
DEFINES['HAVE_SIDEBAR'] = True
EXTRA_COMPONENTS += ['nsSidebar.js'] diff --git a/toolkit/components/search/nsSearchService.js b/toolkit/components/search/nsSearchService.js index 82f8d155a..19f4048b4 100644 --- a/toolkit/components/search/nsSearchService.js +++ b/toolkit/components/search/nsSearchService.js @@ -4204,10 +4204,6 @@ SearchService.prototype = { Services.obs.addObserver(this, SEARCH_ENGINE_TOPIC, false); Services.obs.addObserver(this, QUIT_APPLICATION_TOPIC, false); -#ifdef MOZ_FENNEC - Services.prefs.addObserver(LOCALE_PREF, this, false); -#endif - // The current stage of shutdown. Used to help analyze crash // signatures in case of shutdown timeout. let shutdownState = { @@ -4252,10 +4248,6 @@ SearchService.prototype = { _removeObservers: function SRCH_SVC_removeObservers() { Services.obs.removeObserver(this, SEARCH_ENGINE_TOPIC); Services.obs.removeObserver(this, QUIT_APPLICATION_TOPIC); - -#ifdef MOZ_FENNEC - Services.prefs.removeObserver(LOCALE_PREF, this); -#endif }, QueryInterface: function SRCH_SVC_QI(aIID) { |