From e23e7a002d2f4c7b77e36b1819fd28f2c33b4c23 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 18 Mar 2018 19:27:05 +0100 Subject: [PATCH] Bug 1446809 - Remove some b2g leftover in desktop/ r=florian MozReview-Commit-ID: FPwAZmpoiUV --HG-- extra : rebase_source : 04389166cdbd7f17a7037928144c5f66f6e01d2b extra : source : 347d7259df0fd92d817318d490333fe4103c5841 --- browser/components/BrowserComponents.manifest | 4 +--- browser/components/feeds/BrowserFeeds.manifest | 4 +--- browser/components/sessionstore/nsSessionStore.manifest | 4 +--- browser/experiments/docs/manifest.rst | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/browser/components/BrowserComponents.manifest b/browser/components/BrowserComponents.manifest index dbfc3d2ec491..4e304364c507 100644 --- a/browser/components/BrowserComponents.manifest +++ b/browser/components/BrowserComponents.manifest @@ -29,15 +29,13 @@ category command-line-validator b-browser @mozilla.org/browser/clh;1 application # to the specific list of apps that use it so it doesn't get loaded in xpcshell. # Thus we restrict it to these apps: # -# b2g: {3c2e2abc-06d4-11e1-ac3b-374f68613e61} # browser: {ec8030f7-c20a-464f-9b0e-13a3a9e97384} # mobile/android: {aa3c5121-dab2-40e2-81ca-7ea25febc110} # mobile/xul: {a23983c0-fd0e-11dc-95ff-0800200c9a66} -# graphene: {d1bfe7d9-c01e-4237-998b-7b5f960a4314} component {eab9012e-5f74-4cbc-b2b5-a590235513cc} nsBrowserGlue.js contract @mozilla.org/browser/browserglue;1 {eab9012e-5f74-4cbc-b2b5-a590235513cc} -category app-startup nsBrowserGlue service,@mozilla.org/browser/browserglue;1 application={3c2e2abc-06d4-11e1-ac3b-374f68613e61} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={a23983c0-fd0e-11dc-95ff-0800200c9a66} application={d1bfe7d9-c01e-4237-998b-7b5f960a4314} +category app-startup nsBrowserGlue service,@mozilla.org/browser/browserglue;1 application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={a23983c0-fd0e-11dc-95ff-0800200c9a66} component {d8903bf6-68d5-4e97-bcd1-e4d3012f721a} nsBrowserGlue.js #ifndef MOZ_MULET contract @mozilla.org/content-permission/prompt;1 {d8903bf6-68d5-4e97-bcd1-e4d3012f721a} diff --git a/browser/components/feeds/BrowserFeeds.manifest b/browser/components/feeds/BrowserFeeds.manifest index 9088eb0373f2..b015f33ec27f 100644 --- a/browser/components/feeds/BrowserFeeds.manifest +++ b/browser/components/feeds/BrowserFeeds.manifest @@ -2,11 +2,9 @@ # to the specific list of apps that use it so it doesn't get loaded in xpcshell. # Thus we restrict it to these apps: # -# b2g: {3c2e2abc-06d4-11e1-ac3b-374f68613e61} # browser: {ec8030f7-c20a-464f-9b0e-13a3a9e97384} # mobile/android: {aa3c5121-dab2-40e2-81ca-7ea25febc110} # mobile/xul: {a23983c0-fd0e-11dc-95ff-0800200c9a66} -# graphene: {d1bfe7d9-c01e-4237-998b-7b5f960a4314} component {229fa115-9412-4d32-baf3-2fc407f76fb1} FeedConverter.js contract @mozilla.org/streamconv;1?from=application/vnd.mozilla.maybe.feed&to=*/* {229fa115-9412-4d32-baf3-2fc407f76fb1} @@ -18,4 +16,4 @@ component {49bb6593-3aff-4eb3-a068-2712c28bd58e} FeedWriter.js contract @mozilla.org/browser/feeds/result-writer;1 {49bb6593-3aff-4eb3-a068-2712c28bd58e} component {792a7e82-06a0-437c-af63-b2d12e808acc} WebContentConverter.js contract @mozilla.org/embeddor.implemented/web-content-handler-registrar;1 {792a7e82-06a0-437c-af63-b2d12e808acc} -category app-startup WebContentConverter service,@mozilla.org/embeddor.implemented/web-content-handler-registrar;1 application={3c2e2abc-06d4-11e1-ac3b-374f68613e61} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={a23983c0-fd0e-11dc-95ff-0800200c9a66} application={d1bfe7d9-c01e-4237-998b-7b5f960a4314} +category app-startup WebContentConverter service,@mozilla.org/embeddor.implemented/web-content-handler-registrar;1 application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={a23983c0-fd0e-11dc-95ff-0800200c9a66} diff --git a/browser/components/sessionstore/nsSessionStore.manifest b/browser/components/sessionstore/nsSessionStore.manifest index 9b5819c6a37c..a3a03bd00415 100644 --- a/browser/components/sessionstore/nsSessionStore.manifest +++ b/browser/components/sessionstore/nsSessionStore.manifest @@ -2,14 +2,12 @@ # to the specific list of apps that use it so it doesn't get loaded in xpcshell. # Thus we restrict it to these apps: # -# b2g: {3c2e2abc-06d4-11e1-ac3b-374f68613e61} # browser: {ec8030f7-c20a-464f-9b0e-13a3a9e97384} # mobile/android: {aa3c5121-dab2-40e2-81ca-7ea25febc110} # mobile/xul: {a23983c0-fd0e-11dc-95ff-0800200c9a66} -# graphene: {d1bfe7d9-c01e-4237-998b-7b5f960a4314} component {5280606b-2510-4fe0-97ef-9b5a22eafe6b} nsSessionStore.js contract @mozilla.org/browser/sessionstore;1 {5280606b-2510-4fe0-97ef-9b5a22eafe6b} component {ec7a6c20-e081-11da-8ad9-0800200c9a66} nsSessionStartup.js contract @mozilla.org/browser/sessionstartup;1 {ec7a6c20-e081-11da-8ad9-0800200c9a66} -category app-startup nsSessionStartup service,@mozilla.org/browser/sessionstartup;1 application={3c2e2abc-06d4-11e1-ac3b-374f68613e61} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={a23983c0-fd0e-11dc-95ff-0800200c9a66} application={d1bfe7d9-c01e-4237-998b-7b5f960a4314} +category app-startup nsSessionStartup service,@mozilla.org/browser/sessionstartup;1 application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={a23983c0-fd0e-11dc-95ff-0800200c9a66} diff --git a/browser/experiments/docs/manifest.rst b/browser/experiments/docs/manifest.rst index ab8c13f82c22..213a7517ae61 100644 --- a/browser/experiments/docs/manifest.rst +++ b/browser/experiments/docs/manifest.rst @@ -101,7 +101,7 @@ appName Array of application names this experiment should run on. An application name comes from ``nsIXULAppInfo.name``. It is a value - like ``Firefox``, ``Fennec``, or `B2G`. + like ``Firefox`` or ``Fennec``. The client should compare its application name against the members of this array. If a match is found, the experiment is applicable.