mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out changeset 5c2a88e35ffc (bug 1330349) for failing xpcshell test test_dss.js. r=backout 

--HG--
rename : toolkit/components/extensions/ext-theme.js => browser/components/extensions/ext-theme.js
rename : toolkit/components/extensions/schemas/theme.json => browser/components/extensions/schemas/theme.json
rename : toolkit/components/extensions/test/browser/browser_ext_themes_chromeparity.js => browser/components/extensions/test/browser/browser_ext_themes_chromeparity.js
rename : toolkit/components/extensions/test/browser/browser_ext_themes_dynamic_updates.js => browser/components/extensions/test/browser/browser_ext_themes_dynamic_updates.js
rename : toolkit/components/extensions/test/browser/browser_ext_themes_lwtsupport.js => browser/components/extensions/test/browser/browser_ext_themes_lwtsupport.js
This commit is contained in:
Sebastian Hengst 2017-03-01 20:09:01 +01:00
Родитель 01a59dc23c
Коммит 5b64461cd0
17 изменённых файлов: 31 добавлений и 54 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
browser/app/profile/firefox.js
Просмотреть файл

@ -65,6 +65,9 @@ pref("extensions.systemAddon.update.url", "https://aus5.mozilla.org/update/3/Sys
// See the SCOPE constants in AddonManager.jsm for values to use here.
pref("extensions.autoDisableScopes", 15);
// Whether or not webextension themes are supported.
pref("extensions.webextensions.themes.enabled", false);
// Add-on content security policies.
pref("extensions.webextensions.base-content-security-policy", "script-src 'self' https://* moz-extension: blob: filesystem: 'unsafe-eval' 'unsafe-inline'; object-src 'self' https://* moz-extension: blob: filesystem:;");
pref("extensions.webextensions.default-content-security-policy", "script-src 'self'; object-src 'self';");

0
toolkit/components/extensions/ext-theme.js → browser/components/extensions/ext-theme.js
Просмотреть файл

2
browser/components/extensions/extensions-browser.manifest
Просмотреть файл

@ -15,6 +15,7 @@ category webextension-scripts pageAction chrome://browser/content/ext-pageAction
category webextension-scripts sessions chrome://browser/content/ext-sessions.js
category webextension-scripts sidebarAction chrome://browser/content/ext-sidebarAction.js
category webextension-scripts tabs chrome://browser/content/ext-tabs.js
category webextension-scripts theme chrome://browser/content/ext-theme.js
category webextension-scripts url-overrides chrome://browser/content/ext-url-overrides.js
category webextension-scripts utils chrome://browser/content/ext-utils.js
category webextension-scripts windows chrome://browser/content/ext-windows.js
@ -45,5 +46,6 @@ category webextension-schemas page_action chrome://browser/content/schemas/page_
category webextension-schemas sessions chrome://browser/content/schemas/sessions.json
category webextension-schemas sidebar_action chrome://browser/content/schemas/sidebar_action.json
category webextension-schemas tabs chrome://browser/content/schemas/tabs.json
category webextension-schemas theme chrome://browser/content/schemas/theme.json
category webextension-schemas url_overrides chrome://browser/content/schemas/url_overrides.json
category webextension-schemas windows chrome://browser/content/schemas/windows.json

1
browser/components/extensions/jar.mn
Просмотреть файл

@ -28,6 +28,7 @@ browser.jar:
content/browser/ext-sessions.js
content/browser/ext-sidebarAction.js
content/browser/ext-tabs.js
content/browser/ext-theme.js
content/browser/ext-url-overrides.js
content/browser/ext-utils.js
content/browser/ext-windows.js

1
browser/components/extensions/schemas/jar.mn
Просмотреть файл

@ -19,5 +19,6 @@ browser.jar:
content/browser/schemas/sessions.json
content/browser/schemas/sidebar_action.json
content/browser/schemas/tabs.json
content/browser/schemas/theme.json
content/browser/schemas/url_overrides.json
content/browser/schemas/windows.json

0
toolkit/components/extensions/schemas/theme.json → browser/components/extensions/schemas/theme.json
Просмотреть файл

5
browser/components/extensions/test/browser/browser-common.ini
Просмотреть файл

@ -113,6 +113,9 @@ support-files =
[browser_ext_tabs_update.js]
[browser_ext_tabs_zoom.js]
[browser_ext_tabs_update_url.js]
[browser_ext_themes_chromeparity.js]
[browser_ext_themes_dynamic_updates.js]
[browser_ext_themes_lwtsupport.js]
[browser_ext_topwindowid.js]
[browser_ext_url_overrides_all.js]
[browser_ext_url_overrides_home.js]
@ -131,4 +134,4 @@ tags = fullscreen
[browser_ext_windows_size.js]
skip-if = os == 'mac' # Fails when windows are randomly opened in fullscreen mode
[browser_ext_windows_update.js]
tags = fullscreen
tags = fullscreen

0
toolkit/components/extensions/test/browser/browser_ext_themes_chromeparity.js → browser/components/extensions/test/browser/browser_ext_themes_chromeparity.js
Просмотреть файл

0
toolkit/components/extensions/test/browser/browser_ext_themes_dynamic_updates.js → browser/components/extensions/test/browser/browser_ext_themes_dynamic_updates.js
Просмотреть файл

0
toolkit/components/extensions/test/browser/browser_ext_themes_lwtsupport.js → browser/components/extensions/test/browser/browser_ext_themes_lwtsupport.js
Просмотреть файл

2
modules/libpref/init/all.js
Просмотреть файл

@ -4791,8 +4791,6 @@ pref("extensions.webextensions.keepStorageOnUninstall", false);
pref("extensions.webextensions.keepUuidOnUninstall", false);
// Redirect basedomain used by identity api
pref("extensions.webextensions.identity.redirectDomain", "extensions.allizom.org");
// Whether or not webextension themes are supported.
pref("extensions.webextensions.themes.enabled", false);
pref("extensions.webextensions.remote", false);
// Report Site Issue button

26
toolkit/components/extensions/extensions-toolkit.manifest
Просмотреть файл

@ -4,34 +4,33 @@ category webextension-scripts backgroundPage chrome://extensions/content/ext-bac
category webextension-scripts contextualIdentities chrome://extensions/content/ext-contextualIdentities.js
category webextension-scripts cookies chrome://extensions/content/ext-cookies.js
category webextension-scripts downloads chrome://extensions/content/ext-downloads.js
category webextension-scripts extension chrome://extensions/content/ext-extension.js
category webextension-scripts geolocation chrome://extensions/content/ext-geolocation.js
category webextension-scripts handlers chrome://extensions/content/ext-protocolHandlers.js
category webextension-scripts i18n chrome://extensions/content/ext-i18n.js
category webextension-scripts idle chrome://extensions/content/ext-idle.js
category webextension-scripts management chrome://extensions/content/ext-management.js
category webextension-scripts notifications chrome://extensions/content/ext-notifications.js
category webextension-scripts privacy chrome://extensions/content/ext-privacy.js
category webextension-scripts runtime chrome://extensions/content/ext-runtime.js
category webextension-scripts storage chrome://extensions/content/ext-storage.js
category webextension-scripts theme chrome://extensions/content/ext-theme.js
category webextension-scripts topSites chrome://extensions/content/ext-topSites.js
category webextension-scripts webNavigation chrome://extensions/content/ext-webNavigation.js
category webextension-scripts i18n chrome://extensions/content/ext-i18n.js
category webextension-scripts idle chrome://extensions/content/ext-idle.js
category webextension-scripts webRequest chrome://extensions/content/ext-webRequest.js
category webextension-scripts webNavigation chrome://extensions/content/ext-webNavigation.js
category webextension-scripts handlers chrome://extensions/content/ext-protocolHandlers.js
category webextension-scripts runtime chrome://extensions/content/ext-runtime.js
category webextension-scripts extension chrome://extensions/content/ext-extension.js
category webextension-scripts storage chrome://extensions/content/ext-storage.js
category webextension-scripts topSites chrome://extensions/content/ext-topSites.js
category webextension-scripts privacy chrome://extensions/content/ext-privacy.js
# scripts specific for content process.
category webextension-scripts-content extension chrome://extensions/content/ext-c-extension.js
category webextension-scripts-content i18n chrome://extensions/content/ext-i18n.js
category webextension-scripts-content runtime chrome://extensions/content/ext-c-runtime.js
category webextension-scripts-content storage chrome://extensions/content/ext-c-storage.js
category webextension-scripts-content test chrome://extensions/content/ext-c-test.js
category webextension-scripts-content storage chrome://extensions/content/ext-c-storage.js
# scripts specific for devtools extension contexts.
category webextension-scripts-devtools extension chrome://extensions/content/ext-c-extension.js
category webextension-scripts-devtools i18n chrome://extensions/content/ext-i18n.js
category webextension-scripts-devtools runtime chrome://extensions/content/ext-c-runtime.js
category webextension-scripts-devtools storage chrome://extensions/content/ext-c-storage.js
category webextension-scripts-devtools test chrome://extensions/content/ext-c-test.js
category webextension-scripts-devtools storage chrome://extensions/content/ext-c-storage.js
# scripts that must run in the same process as addon code.
category webextension-scripts-addon backgroundPage chrome://extensions/content/ext-c-backgroundPage.js
@ -41,8 +40,8 @@ category webextension-scripts-addon i18n chrome://extensions/content/ext-i18n.js
category webextension-scripts-addon identity chrome://extensions/content/ext-c-identity.js
#endif
category webextension-scripts-addon runtime chrome://extensions/content/ext-c-runtime.js
category webextension-scripts-addon storage chrome://extensions/content/ext-c-storage.js
category webextension-scripts-addon test chrome://extensions/content/ext-c-test.js
category webextension-scripts-addon storage chrome://extensions/content/ext-c-storage.js
# schemas
category webextension-schemas alarms chrome://extensions/content/schemas/alarms.json
@ -65,7 +64,6 @@ category webextension-schemas privacy chrome://extensions/content/schemas/privac
category webextension-schemas runtime chrome://extensions/content/schemas/runtime.json
category webextension-schemas storage chrome://extensions/content/schemas/storage.json
category webextension-schemas test chrome://extensions/content/schemas/test.json
category webextension-schemas theme chrome://extensions/content/schemas/theme.json
category webextension-schemas top_sites chrome://extensions/content/schemas/top_sites.json
category webextension-schemas types chrome://extensions/content/schemas/types.json
category webextension-schemas web_navigation chrome://extensions/content/schemas/web_navigation.json

19
toolkit/components/extensions/jar.mn
Просмотреть файл

@ -10,22 +10,19 @@ toolkit.jar:
content/extensions/ext-contextualIdentities.js
content/extensions/ext-cookies.js
content/extensions/ext-downloads.js
content/extensions/ext-extension.js
content/extensions/ext-geolocation.js
content/extensions/ext-i18n.js
content/extensions/ext-idle.js
content/extensions/ext-management.js
content/extensions/ext-notifications.js
content/extensions/ext-privacy.js
content/extensions/ext-protocolHandlers.js
content/extensions/ext-runtime.js
content/extensions/ext-storage.js
content/extensions/ext-theme.js
content/extensions/ext-topSites.js
content/extensions/ext-i18n.js
content/extensions/ext-idle.js
content/extensions/ext-webRequest.js
content/extensions/ext-webNavigation.js
# Below is a separate group using the naming convention ext-c-*.js that run
# in the child process.
content/extensions/ext-protocolHandlers.js
content/extensions/ext-runtime.js
content/extensions/ext-extension.js
content/extensions/ext-storage.js
content/extensions/ext-topSites.js
content/extensions/ext-privacy.js
content/extensions/ext-c-backgroundPage.js
content/extensions/ext-c-extension.js
#ifndef ANDROID

4
toolkit/components/extensions/moz.build
Просмотреть файл

@ -37,10 +37,6 @@ DIRS += ['schemas']
JAR_MANIFESTS += ['jar.mn']
BROWSER_CHROME_MANIFESTS += [
'test/browser/browser.ini',
]
MOCHITEST_MANIFESTS += [
'test/mochitest/mochitest-remote.ini',
'test/mochitest/mochitest.ini'

1
toolkit/components/extensions/schemas/jar.mn
Просмотреть файл

@ -26,7 +26,6 @@ toolkit.jar:
content/extensions/schemas/runtime.json
content/extensions/schemas/storage.json
content/extensions/schemas/test.json
content/extensions/schemas/theme.json
content/extensions/schemas/top_sites.json
content/extensions/schemas/types.json
content/extensions/schemas/web_navigation.json

18
toolkit/components/extensions/test/browser/.eslintrc.js
Просмотреть файл

@ -1,18 +0,0 @@
"use strict";
module.exports = { // eslint-disable-line no-undef
"extends": "../../../../../testing/mochitest/mochitest.eslintrc.js",
"env": {
"webextensions": true,
},
"globals": {
"ExtensionTestUtils": false,
"XPCOMUtils": true,
},
"rules": {
"no-shadow": 0,
},
};

3
toolkit/components/extensions/test/browser/browser.ini
Просмотреть файл

@ -1,3 +0,0 @@
[browser_ext_themes_chromeparity.js]
[browser_ext_themes_dynamic_updates.js]
[browser_ext_themes_lwtsupport.js]