|
@@ -0,0 +1,67 @@
|
|
|
|
+# HG changeset patch
|
|
|
|
+# User Zibi Braniecki <zbraniecki@mozilla.com>
|
|
|
|
+# Date 1503680417 25200
|
|
|
|
+# Node ID 43855f42baabb1e7e19abd41540dccebd3926697
|
|
|
|
+# Parent c423d7c2998a580d7ffaf597c646065e3e349ea4
|
|
|
|
+Bug 1393848 - Move search-plugin resource entry to browser's content jar.mn. r=Pike
|
|
|
|
+
|
|
|
|
+MozReview-Commit-ID: JJD222TkR8a
|
|
|
|
+
|
|
|
|
+diff --git a/browser/base/jar.mn b/browser/base/jar.mn
|
|
|
|
+--- a/browser/base/jar.mn
|
|
|
|
++++ b/browser/base/jar.mn
|
|
|
|
+@@ -155,12 +155,13 @@ browser.jar:
|
|
|
|
+ * content/browser/license.html (/toolkit/content/license.html)
|
|
|
|
+ % override chrome://global/content/license.html chrome://browser/content/license.html
|
|
|
|
+ content/browser/report-phishing-overlay.xul (content/report-phishing-overlay.xul)
|
|
|
|
+ content/browser/blockedSite.xhtml (content/blockedSite.xhtml)
|
|
|
|
+ % overlay chrome://browser/content/browser.xul chrome://browser/content/report-phishing-overlay.xul
|
|
|
|
+
|
|
|
|
+ % override chrome://global/content/netError.xhtml chrome://browser/content/aboutNetError.xhtml
|
|
|
|
+
|
|
|
|
+-# L10n resource overrides.
|
|
|
|
++# L10n resources and overrides.
|
|
|
|
+ % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties
|
|
|
|
+ % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd
|
|
|
|
+ % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd
|
|
|
|
++% resource search-plugins chrome://browser/locale/searchplugins/
|
|
|
|
+diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
|
|
|
|
+--- a/browser/locales/jar.mn
|
|
|
|
++++ b/browser/locales/jar.mn
|
|
|
|
+@@ -1,15 +1,16 @@
|
|
|
|
+ #filter substitution
|
|
|
|
+ # This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
|
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
|
|
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
|
+
|
|
|
|
+-# Note: All overrides should go to browser/base/jar.mn in order to avoid
|
|
|
|
+-# having to create the same override entry for each locale.
|
|
|
|
++# Note: This file should only contain locale entries. All
|
|
|
|
++# override and resource entries should go to browser/base/jar.mn to avoid
|
|
|
|
++# having to create the same entry for each locale.
|
|
|
|
+
|
|
|
|
+ @AB_CD@.jar:
|
|
|
|
+ % locale browser @AB_CD@ %locale/browser/
|
|
|
|
+ # bookmarks.html is produced by LOCALIZED_GENERATED_FILES.
|
|
|
|
+ locale/browser/bookmarks.html (bookmarks.html)
|
|
|
|
+ locale/browser/aboutAccounts.dtd (%chrome/browser/aboutAccounts.dtd)
|
|
|
|
+ locale/browser/aboutDialog.dtd (%chrome/browser/aboutDialog.dtd)
|
|
|
|
+ locale/browser/aboutPrivateBrowsing.dtd (%chrome/browser/aboutPrivateBrowsing.dtd)
|
|
|
|
+@@ -95,17 +96,16 @@
|
|
|
|
+ locale/browser/preferences/siteDataSettings.dtd (%chrome/browser/preferences/siteDataSettings.dtd)
|
|
|
|
+ locale/browser/preferences-old/sync.dtd (%chrome/browser/preferences-old/sync.dtd)
|
|
|
|
+ locale/browser/preferences/sync.dtd (%chrome/browser/preferences/sync.dtd)
|
|
|
|
+ locale/browser/preferences-old/tabs.dtd (%chrome/browser/preferences-old/tabs.dtd)
|
|
|
|
+ locale/browser/preferences/tabs.dtd (%chrome/browser/preferences/tabs.dtd)
|
|
|
|
+ locale/browser/preferences/translation.dtd (%chrome/browser/preferences/translation.dtd)
|
|
|
|
+ locale/browser/syncBrand.dtd (%chrome/browser/syncBrand.dtd)
|
|
|
|
+ locale/browser/syncSetup.properties (%chrome/browser/syncSetup.properties)
|
|
|
|
+-% resource search-plugins chrome://browser/locale/searchplugins/
|
|
|
|
+ #if BUILD_FASTER
|
|
|
|
+ locale/browser/searchplugins/ (searchplugins/*.xml)
|
|
|
|
+ locale/browser/searchplugins/list.json (search/list.json)
|
|
|
|
+ #else
|
|
|
|
+ locale/browser/searchplugins/ (.deps/generated_@AB_CD@/*.xml)
|
|
|
|
+ locale/browser/searchplugins/list.json (.deps/generated_@AB_CD@/list.json)
|
|
|
|
+ #endif
|
|
|
|
+ locale/browser/searchplugins/images/amazon.ico (searchplugins/images/amazon.ico)
|