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 | d5e2aa99c258bc62353075f07c94d73577daa692 (patch) | |
| tree | f649c7aa92e1d49aba43de6ebade282a8bd3da28 /toolkit/components | |
| parent | e07a2eba07e076a1516e7c25173a304d31da9ef6 (diff) | |
| download | uxp-d5e2aa99c258bc62353075f07c94d73577daa692.tar.gz | |
Issue mcp-graveyard/UXP#1053 - Drop support Android and remove Fennec - Part 1b: Remove MOZ_FENNEC
Diffstat (limited to 'toolkit/components')
| -rw-r--r-- | toolkit/components/cookie/jar.mn | 2 | ||||
| -rw-r--r-- | toolkit/components/search/moz.build | 2 | ||||
| -rw-r--r-- | toolkit/components/search/nsSearchService.js | 8 |
3 files changed, 1 insertions, 11 deletions
diff --git a/toolkit/components/cookie/jar.mn b/toolkit/components/cookie/jar.mn index 109e6cd4f9..2826bbcd6f 100644 --- a/toolkit/components/cookie/jar.mn +++ b/toolkit/components/cookie/jar.mn @@ -3,8 +3,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. toolkit.jar: -#ifndef MOZ_FENNEC % content cookie %content/cookie/ content/cookie/cookieAcceptDialog.xul (content/cookieAcceptDialog.xul) content/cookie/cookieAcceptDialog.js (content/cookieAcceptDialog.js) -#endif diff --git a/toolkit/components/search/moz.build b/toolkit/components/search/moz.build index 2f8b3e54c2..43414963d4 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 82f8d155a5..19f4048b48 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) { |