Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 8626a98a34d8 (bug 1145394) for mochitest-bc gApplicationsPane errors.

Browse Source 
CLOSED TREE

--HG--
extra : rebase_source : 69612da9e0ec97da280745aa98fc72ad4a5840ef
This commit is contained in:
Ryan VanderMeulen 2015-03-20 16:23:26 -04:00
parent 6fa51cb894
commit cbfa120ebf
4 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
browser/components/preferences/applications.js
View File

@ -13,7 +13,6 @@ var Ci = Components.interfaces;
var Cr = Components.results;
Components.utils.import('resource://gre/modules/Services.jsm');
Components.utils.import('resource://gre/modules/AppConstants.jsm');
const TYPE_MAYBE_FEED = "application/vnd.mozilla.maybe.feed";
const TYPE_MAYBE_VIDEO_FEED = "application/vnd.mozilla.maybe.video.feed";
@ -74,9 +73,17 @@ const PREF_AUDIO_FEED_SELECTED_READER = "browser.audioFeeds.handler.default";
// identifying the "use plugin" action, so we use this constant instead.
const kActionUsePlugin = 5;
const ICON_URL_APP = AppConstants.platform == "linux" ?
"moz-icon://dummy.exe?size=16" :
"chrome://browser/skin/preferences/application.png";
/*
#ifdef MOZ_WIDGET_GTK
*/
const ICON_URL_APP = "moz-icon://dummy.exe?size=16";
/*
#else
*/
const ICON_URL_APP = "chrome://browser/skin/preferences/application.png";
/*
#endif
*/
// For CSS. Can be one of "ask", "save", "plugin" or "feed". If absent, the icon URL
// was set by us to a custom handler icon and CSS should not try to override it.

15
browser/components/preferences/in-content/applications.js
View File

@ -8,7 +8,6 @@
// Constants & Enumeration Values
Components.utils.import('resource://gre/modules/Services.jsm');
Components.utils.import('resource://gre/modules/AppConstants.jsm');
const TYPE_MAYBE_FEED = "application/vnd.mozilla.maybe.feed";
const TYPE_MAYBE_VIDEO_FEED = "application/vnd.mozilla.maybe.video.feed";
const TYPE_MAYBE_AUDIO_FEED = "application/vnd.mozilla.maybe.audio.feed";
@ -68,9 +67,17 @@ const PREF_AUDIO_FEED_SELECTED_READER = "browser.audioFeeds.handler.default";
// identifying the "use plugin" action, so we use this constant instead.
const kActionUsePlugin = 5;
const ICON_URL_APP = AppConstants.platform == "linux" ?
"moz-icon://dummy.exe?size=16" :
"chrome://browser/skin/preferences/application.png";
/*
#if MOZ_WIDGET_GTK == 2
*/
const ICON_URL_APP = "moz-icon://dummy.exe?size=16";
/*
#else
*/
const ICON_URL_APP = "chrome://browser/skin/preferences/application.png";
/*
#endif
*/
// For CSS. Can be one of "ask", "save", "plugin" or "feed". If absent, the icon URL
// was set by us to a custom handler icon and CSS should not try to override it.

2
browser/components/preferences/in-content/jar.mn
View File

@ -10,7 +10,7 @@ browser.jar:
* content/browser/preferences/in-content/main.js
* content/browser/preferences/in-content/privacy.js
* content/browser/preferences/in-content/advanced.js
content/browser/preferences/in-content/applications.js
* content/browser/preferences/in-content/applications.js
content/browser/preferences/in-content/content.js
content/browser/preferences/in-content/sync.js
content/browser/preferences/in-content/security.js

2
browser/components/preferences/jar.mn
View File

@ -10,7 +10,7 @@ browser.jar:
* content/browser/preferences/advanced.xul
* content/browser/preferences/advanced.js
content/browser/preferences/applications.xul
content/browser/preferences/applications.js
* content/browser/preferences/applications.js
content/browser/preferences/applicationManager.xul
* content/browser/preferences/applicationManager.js
* content/browser/preferences/colors.xul