зеркало из https://github.com/mozilla/gecko-dev.git
Bug 961780 - Use "b2g" package name instead of "browser". r=fabrice
This commit is contained in:
Родитель
7818261a54
Коммит
b545cfef74
|
@ -4,8 +4,8 @@
|
|||
|
||||
#filter substitution
|
||||
|
||||
pref("toolkit.defaultChromeURI", "chrome://browser/content/shell.html");
|
||||
pref("browser.chromeURL", "chrome://browser/content/");
|
||||
pref("toolkit.defaultChromeURI", "chrome://b2g/content/shell.html");
|
||||
pref("browser.chromeURL", "chrome://b2g/content/");
|
||||
|
||||
// Bug 945235: Prevent all bars to be considered visible:
|
||||
pref("toolkit.defaultChromeFeatures", "chrome,dialog=no,close,resizable,scrollbars,extrachrome");
|
||||
|
@ -137,9 +137,6 @@ pref("accessibility.typeaheadfind.flashBar", 1);
|
|||
pref("accessibility.typeaheadfind.linksonly", false);
|
||||
pref("accessibility.typeaheadfind.casesensitive", 0);
|
||||
|
||||
// pointer to the default engine name
|
||||
pref("browser.search.defaultenginename", "chrome://browser/locale/region.properties");
|
||||
|
||||
// SSL error page behaviour
|
||||
pref("browser.ssl_override_behavior", 2);
|
||||
pref("browser.xul.error_pages.expert_bad_cert", false);
|
||||
|
|
Двоичный файл не отображается.
После Ширина: | Высота: | Размер: 246 B |
Двоичный файл не отображается.
После Ширина: | Высота: | Размер: 235 B |
|
@ -47,7 +47,7 @@ li {
|
|||
}
|
||||
|
||||
#errorTitle {
|
||||
background: url("chrome://browser/content/images/errorpage-warning.png") left center no-repeat;
|
||||
background: url("chrome://b2g/content/images/errorpage-warning.png") left center no-repeat;
|
||||
/* Scaled by .666 of their actual size */
|
||||
background-size: 40px 40px;
|
||||
background-origin: content-box;
|
||||
|
@ -60,11 +60,11 @@ li {
|
|||
}
|
||||
|
||||
#errorPage.certerror #errorTitle {
|
||||
background-image: url("chrome://browser/content/images/errorpage-larry-black.png");
|
||||
background-image: url("chrome://b2g/content/images/errorpage-larry-black.png");
|
||||
}
|
||||
|
||||
#errorPage.blockedsite #errorTitle {
|
||||
background-image: url("chrome://browser/content/images/errorpage-larry-white.png");
|
||||
background-image: url("chrome://b2g/content/images/errorpage-larry-white.png");
|
||||
color: white;
|
||||
}
|
||||
|
||||
|
@ -107,18 +107,18 @@ li {
|
|||
|
||||
div[collapsed] {
|
||||
padding-left: 15px;
|
||||
background-image: url("chrome://browser/skin/images/arrowright-16.png");
|
||||
background-image: url("chrome://b2g/content/images/arrowright-16.png");
|
||||
background-size: 11px 11px;
|
||||
background-repeat: no-repeat;
|
||||
background-position: left 0.3em;
|
||||
}
|
||||
|
||||
div[collapsed="true"] {
|
||||
background-image: url("chrome://browser/skin/images/arrowright-16.png");
|
||||
background-image: url("chrome://b2g/content/images/arrowright-16.png");
|
||||
}
|
||||
|
||||
div[collapsed="false"] {
|
||||
background-image: url("chrome://browser/skin/images/arrowdown-16.png");
|
||||
background-image: url("chrome://b2g/content/images/arrowdown-16.png");
|
||||
}
|
||||
|
||||
div[collapsed="true"] > p,
|
||||
|
|
|
@ -224,7 +224,7 @@ SettingsListener.observe('devtools.overlay', false, (value) => {
|
|||
if (value) {
|
||||
if (!devtoolsWidgetPanel) {
|
||||
let scope = {};
|
||||
Services.scriptloader.loadSubScript('chrome://browser/content/devtools.js', scope);
|
||||
Services.scriptloader.loadSubScript('chrome://b2g/content/devtools.js', scope);
|
||||
devtoolsWidgetPanel = scope.devtoolsWidgetPanel;
|
||||
}
|
||||
devtoolsWidgetPanel.init();
|
||||
|
|
|
@ -14,20 +14,20 @@
|
|||
|
||||
<head>
|
||||
<script type="application/javascript;version=1.8"
|
||||
src="chrome://browser/content/settings.js"> </script>
|
||||
src="chrome://b2g/content/settings.js"> </script>
|
||||
<script type="application/javascript;version=1.8"
|
||||
src="chrome://browser/content/shell.js"> </script>
|
||||
src="chrome://b2g/content/shell.js"> </script>
|
||||
|
||||
#ifndef MOZ_WIDGET_GONK
|
||||
<!-- various task that has to happen only on desktop -->
|
||||
<script type="application/javascript;version=1.8"
|
||||
src="chrome://browser/content/desktop.js"> </script>
|
||||
src="chrome://b2g/content/desktop.js"> </script>
|
||||
<!-- this script handles the screen argument for desktop builds -->
|
||||
<script type="application/javascript;version=1.8"
|
||||
src="chrome://browser/content/screen.js"> </script>
|
||||
src="chrome://b2g/content/screen.js"> </script>
|
||||
<!-- this script handles the "runapp" argument for desktop builds -->
|
||||
<script type="application/javascript;version=1.8"
|
||||
src="chrome://browser/content/runapp.js"> </script>
|
||||
src="chrome://b2g/content/runapp.js"> </script>
|
||||
#endif
|
||||
</head>
|
||||
<body id="container" style="margin: 0px; width:100%; height:100%;">
|
||||
|
|
|
@ -1096,7 +1096,7 @@ let RemoteDebugger = {
|
|||
// the parent process, unless we enable certified apps debugging.
|
||||
let restrictPrivileges = Services.prefs.getBoolPref("devtools.debugger.forbid-certified-apps");
|
||||
DebuggerServer.addBrowserActors("navigator:browser", restrictPrivileges);
|
||||
DebuggerServer.addActors('chrome://browser/content/dbg-browser-actors.js');
|
||||
DebuggerServer.addActors('chrome://b2g/content/dbg-browser-actors.js');
|
||||
|
||||
#ifdef MOZ_WIDGET_GONK
|
||||
DebuggerServer.onConnectionChange = function(what) {
|
||||
|
|
|
@ -37,15 +37,15 @@
|
|||
}
|
||||
|
||||
.fullscreenButton {
|
||||
background: url("chrome://browser/content/images/fullscreen-hdpi.png") no-repeat center;
|
||||
background: url("chrome://b2g/content/images/fullscreen-hdpi.png") no-repeat center;
|
||||
}
|
||||
|
||||
.fullscreenButton[fullscreened="true"] {
|
||||
background: url("chrome://browser/content/images/exitfullscreen-hdpi.png") no-repeat center;
|
||||
background: url("chrome://b2g/content/images/exitfullscreen-hdpi.png") no-repeat center;
|
||||
}
|
||||
|
||||
.playButton {
|
||||
background: url("chrome://browser/content/images/pause-hdpi.png") no-repeat center;
|
||||
background: url("chrome://b2g/content/images/pause-hdpi.png") no-repeat center;
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -59,15 +59,15 @@
|
|||
}
|
||||
|
||||
.playButton[paused="true"] {
|
||||
background: url("chrome://browser/content/images/play-hdpi.png") no-repeat center;
|
||||
background: url("chrome://b2g/content/images/play-hdpi.png") no-repeat center;
|
||||
}
|
||||
|
||||
.muteButton {
|
||||
background: url("chrome://browser/content/images/mute-hdpi.png") no-repeat center;
|
||||
background: url("chrome://b2g/content/images/mute-hdpi.png") no-repeat center;
|
||||
}
|
||||
|
||||
.muteButton[muted="true"] {
|
||||
background: url("chrome://browser/content/images/unmute-hdpi.png") no-repeat center;
|
||||
background: url("chrome://b2g/content/images/unmute-hdpi.png") no-repeat center;
|
||||
}
|
||||
|
||||
/* bars */
|
||||
|
@ -121,7 +121,7 @@
|
|||
display: -moz-box;
|
||||
margin: 0px !important;
|
||||
padding: 0px !important;
|
||||
background: url("chrome://browser/content/images/scrubber-hdpi.png") no-repeat;
|
||||
background: url("chrome://b2g/content/images/scrubber-hdpi.png") no-repeat;
|
||||
background-size: 32px 32px;
|
||||
height: 32px;
|
||||
width: 32px;
|
||||
|
@ -154,11 +154,11 @@
|
|||
}
|
||||
|
||||
.statusIcon[type="throbber"] {
|
||||
background: url("chrome://browser/content/images/throbber.png") no-repeat center;
|
||||
background: url("chrome://b2g/content/images/throbber.png") no-repeat center;
|
||||
}
|
||||
|
||||
.statusIcon[type="error"] {
|
||||
background: url("chrome://browser/content/images/error.png") no-repeat center;
|
||||
background: url("chrome://b2g/content/images/error.png") no-repeat center;
|
||||
}
|
||||
|
||||
/* CSS Transitions */
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
chrome.jar:
|
||||
% content branding %content/branding/
|
||||
% content browser %content/
|
||||
% content b2g %content/
|
||||
|
||||
content/arrow.svg (content/arrow.svg)
|
||||
* content/dbg-browser-actors.js (content/dbg-browser-actors.js)
|
||||
|
@ -25,9 +25,9 @@ chrome.jar:
|
|||
* content/payment.js (content/payment.js)
|
||||
content/identity.js (content/identity.js)
|
||||
|
||||
% override chrome://global/skin/media/videocontrols.css chrome://browser/content/touchcontrols.css
|
||||
% override chrome://global/content/aboutCertError.xhtml chrome://browser/content/aboutCertError.xhtml
|
||||
% override chrome://global/skin/netError.css chrome://browser/content/netError.css
|
||||
% override chrome://global/skin/media/videocontrols.css chrome://b2g/content/touchcontrols.css
|
||||
% override chrome://global/content/aboutCertError.xhtml chrome://b2g/content/aboutCertError.xhtml
|
||||
% override chrome://global/skin/netError.css chrome://b2g/content/netError.css
|
||||
|
||||
content/ErrorPage.js (content/ErrorPage.js)
|
||||
content/aboutCertError.xhtml (content/aboutCertError.xhtml)
|
||||
|
@ -35,6 +35,8 @@ chrome.jar:
|
|||
content/images/errorpage-larry-black.png (content/images/errorpage-larry-black.png)
|
||||
content/images/errorpage-larry-white.png (content/images/errorpage-larry-white.png)
|
||||
content/images/errorpage-warning.png (content/images/errorpage-warning.png)
|
||||
content/images/arrowdown-16.png (content/images/arrowdown-16.png)
|
||||
content/images/arrowright-16.png (content/images/arrowright-16.png)
|
||||
content/images/scrubber-hdpi.png (content/images/scrubber-hdpi.png)
|
||||
content/images/unmute-hdpi.png (content/images/unmute-hdpi.png)
|
||||
content/images/pause-hdpi.png (content/images/pause-hdpi.png)
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
DEFINES['AB_CD'] = CONFIG['MOZ_UI_LOCALE']
|
||||
DEFINES['PACKAGE'] = 'browser'
|
||||
DEFINES['PACKAGE'] = 'b2g'
|
||||
DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
|
||||
|
||||
JAR_MANIFESTS += ['jar.mn']
|
||||
|
|
|
@ -21,7 +21,7 @@ function netErrorURL() {
|
|||
|
||||
let modules = {
|
||||
certerror: {
|
||||
uri: "chrome://browser/content/aboutCertError.xhtml",
|
||||
uri: "chrome://b2g/content/aboutCertError.xhtml",
|
||||
privileged: false,
|
||||
hide: true
|
||||
},
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# Scrollbars
|
||||
category agent-style-sheets browser-content-stylesheet chrome://browser/content/content.css
|
||||
category agent-style-sheets browser-content-stylesheet chrome://b2g/content/content.css
|
||||
|
||||
# AlertsService.js
|
||||
component {fe33c107-82a4-41d6-8c64-5353267e04c9} AlertsService.js
|
||||
|
|
|
@ -9,7 +9,7 @@ this.EXPORTED_SYMBOLS = ['ErrorPage'];
|
|||
const Cu = Components.utils;
|
||||
const Cc = Components.classes;
|
||||
const Ci = Components.interfaces;
|
||||
const kErrorPageFrameScript = 'chrome://browser/content/ErrorPage.js';
|
||||
const kErrorPageFrameScript = 'chrome://b2g/content/ErrorPage.js';
|
||||
|
||||
Cu.import('resource://gre/modules/Services.jsm');
|
||||
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
|
|
|
@ -11,7 +11,7 @@ Cu.import("resource://gre/modules/Services.jsm");
|
|||
|
||||
// JS shim that contains the callback functions to be triggered from the
|
||||
// payment provider's code in order to fire DOMRequest events.
|
||||
const kPaymentShimFile = "chrome://browser/content/payment.js";
|
||||
const kPaymentShimFile = "chrome://b2g/content/payment.js";
|
||||
|
||||
// Type of MozChromEvents to handle payment dialogs.
|
||||
const kOpenPaymentConfirmationEvent = "open-payment-confirmation-dialog";
|
||||
|
|
|
@ -100,7 +100,7 @@ try {
|
|||
|
||||
// JS shim that contains the callback functions that
|
||||
// live within the identity UI provisioning frame.
|
||||
const kIdentityShimFile = "chrome://browser/content/identity.js";
|
||||
const kIdentityShimFile = "chrome://b2g/content/identity.js";
|
||||
|
||||
// Type of MozChromeEvents to handle id dialogs.
|
||||
const kOpenIdentityDialog = "id-dialog-open";
|
||||
|
|
Загрузка…
Ссылка в новой задаче