Bug 961780 - Use "b2g" package name instead of "browser". r=fabrice
authorAlexandre Poirot <poirot.alex@gmail.com>
Tue, 11 Feb 2014 09:24:20 -0500
changeset 186304 1f36e3d0f5a75321c6525d683671bbeb2f5c08d4
parent 186303 404fde5b8bb6a8f963abe054c87c43ed3f698619
child 186305 278919f3e25d2af69c5dfe229664550c3a2de38a
push id474
push userasasaki@mozilla.com
push dateMon, 02 Jun 2014 21:01:02 +0000
treeherdermozilla-release@967f4cf1b31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfabrice
bugs961780
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 961780 - Use "b2g" package name instead of "browser". r=fabrice
b2g/app/b2g.js
b2g/chrome/content/images/arrowdown-16.png
b2g/chrome/content/images/arrowright-16.png
b2g/chrome/content/netError.css
b2g/chrome/content/settings.js
b2g/chrome/content/shell.html
b2g/chrome/content/shell.js
b2g/chrome/content/touchcontrols.css
b2g/chrome/jar.mn
b2g/chrome/moz.build
b2g/components/B2GAboutRedirector.js
b2g/components/B2GComponents.manifest
b2g/components/ErrorPage.jsm
b2g/components/PaymentGlue.js
b2g/components/SignInToWebsite.jsm
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -1,16 +1,16 @@
 /* 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/. */
 
 #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");
 
 // Device pixel to CSS px ratio, in percent. Set to -1 to calculate based on display density.
 pref("browser.viewport.scaleRatio", -1);
 
 /* disable text selection */
@@ -132,19 +132,16 @@ pref("privacy.popups.showBrowserMessage"
 pref("keyword.enabled", true);
 
 pref("accessibility.typeaheadfind", false);
 pref("accessibility.typeaheadfind.timeout", 5000);
 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);
 
 // disable logging for the search service by default
 pref("browser.search.log", false);
 
 // disable updating
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c982426f2ade2fdb8e56304cdd333e7fd924e668
GIT binary patch
literal 246
zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Hh8)?hFF}w
zI%zNOAp?O{dnLAnrWV1Vo2|1qFhnZO-oT}OfXVN%QsyQm1J1K2z2+QNlHGIc(#zWS
zbtylp-!k-+@?K!LUdYield#5`N%lg&^9$~k)eo3_j_tByzJ5R@jz2(U9`l2(0xK&&
zx`=u$4n3hRk)WT?YBP1h<(#7;>mCU%^`6=CB&655LYK*`#ic^@gX;;VuzroUu*TaW
tVd^t{i`epvf9(4?Tk5q}<jeN2Y)_oc_He%Ju>rcB!PC{xWt~$(69CB-T~z=8
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..859e98ba64b6621aa74d1998242ece6e22ce2dba
GIT binary patch
literal 235
zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5XdOcknLn>}1{rUgjo>{d)@Fqhsw=}!LR(a33e@{A<`#(q?
zXgOBy@YtS3O3S^Ak-Omsvu2yYqISlBjf_{MnKH6AR<#R8D?BnhBA;<Wt%+?y5{L4>
zj25XPxo(j=);>HUOlnNq-XB+b+AlNX3cpL&BEc1rj8Yjcna9M~IG1D`OFO_AWFqXt
feuSZcftg|b_Xx?Q*F*jT9me44>gTe~DWM4f+X7Dh
--- a/b2g/chrome/content/netError.css
+++ b/b2g/chrome/content/netError.css
@@ -42,34 +42,34 @@ li {
   background-color: #EFD400;
 }
 
 #errorPage.blockedsite {
   background-color: #BF0000;
 }
 
 #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;
   min-height: 60px;
   margin-left: auto;
   margin-right: auto;
   max-width: 500px;
   margin-left: auto;
   margin-right: auto;
 }
 
 #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;
 }
 
 .errorTitleText {
   padding: 0px 0px 0px 50px;
   display: inline-block;
   vertical-align: middle
 }
@@ -102,28 +102,28 @@ li {
 }
 
 #securityOverrideDiv {
   padding-top: 10px;
 }
 
 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,
 div[collapsed="true"] > div {
   display: none;
 }
 
 button {
--- a/b2g/chrome/content/settings.js
+++ b/b2g/chrome/content/settings.js
@@ -219,17 +219,17 @@ Components.utils.import('resource://gre/
 
 // =================== DevTools ====================
 
 let devtoolsWidgetPanel;
 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();
   } else {
     if (devtoolsWidgetPanel) {
       devtoolsWidgetPanel.uninit();
     }
   }
--- a/b2g/chrome/content/shell.html
+++ b/b2g/chrome/content/shell.html
@@ -9,30 +9,30 @@
 #ifdef ANDROID
       sizemode="fullscreen"
 #endif
       style="background: black; overflow: hidden; width:100%; height:100%; padding: 0px !important"
       onunload="shell.stop();">
 
 <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%;">
 #ifdef MOZ_WIDGET_COCOA
     <!--
      If the document is empty at startup, we don't display the window
      at all on Mac OS...
     -->
--- a/b2g/chrome/content/shell.js
+++ b/b2g/chrome/content/shell.js
@@ -1091,17 +1091,17 @@ let RemoteDebugger = {
     if (!DebuggerServer.initialized) {
       // Ask for remote connections.
       DebuggerServer.init(this.prompt.bind(this));
 
       // Add Firefox-specific actors, but prevent tab actors to be loaded in
       // 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) {
         AdbController.updateState();
       }
 #endif
     }
 
--- a/b2g/chrome/content/touchcontrols.css
+++ b/b2g/chrome/content/touchcontrols.css
@@ -32,47 +32,47 @@
 .muteButton {
   -moz-appearance: none;
   min-height: 42px;
   min-width: 42px;
   border: none !important;
 }
 
 .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;
 }
 
 /*
  * Normally the button bar has fullscreen spacer play spacer mute, but if
  * this is an audio control rather than a video control, the fullscreen button
  * is hidden by videocontrols.xml, and that alters the position of the
  * play button.  This workaround moves it back to center.
  */
 .controlBar.audio-only .playButton {
   transform: translateX(28px);
 }
 
 .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 */
 .scrubberStack {
   width: 100%;
   min-height: 32px;
   max-height: 32px;
   padding: 0px 8px;
@@ -116,17 +116,17 @@
   margin-left: -16px;
   margin-right: -16px;
 }
 
 .scrubber .scale-thumb {
   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;
 }
 
 .durationBox {
   -moz-box-orient: horizontal;
   -moz-box-pack: start;
@@ -149,21 +149,21 @@
 
 .statusIcon {
   margin-bottom: 28px;
   width: 36px;
   height: 36px;
 }
 
 .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 */
 .controlBar:not([immediate]) {
   -moz-transition-property: opacity;
   -moz-transition-duration: 200ms;
 }
 
--- a/b2g/chrome/jar.mn
+++ b/b2g/chrome/jar.mn
@@ -1,17 +1,17 @@
 #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/.
 
 
 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)
 * content/settings.js                   (content/settings.js)
 * content/shell.html                    (content/shell.html)
 * content/shell.js                      (content/shell.js)
   content/devtools.js                   (content/devtools.js)
 #ifndef ANDROID
@@ -20,26 +20,28 @@ chrome.jar:
   content/runapp.js                     (content/runapp.js)
 #endif
 * content/content.css                   (content/content.css)
   content/touchcontrols.css             (content/touchcontrols.css)
 
 * 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)
   content/netError.css                  (content/netError.css)
   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)
   content/images/play-hdpi.png         (content/images/play-hdpi.png)
   content/images/mute-hdpi.png         (content/images/mute-hdpi.png)
   content/images/fullscreen-hdpi.png     (content/images/fullscreen-hdpi.png)
   content/images/exitfullscreen-hdpi.png (content/images/exitfullscreen-hdpi.png)
   content/images/throbber.png          (content/images/throbber.png)
--- a/b2g/chrome/moz.build
+++ b/b2g/chrome/moz.build
@@ -1,13 +1,13 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
 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']
 
 TEST_DIRS += ['content/test/mochitest']
--- a/b2g/components/B2GAboutRedirector.js
+++ b/b2g/components/B2GAboutRedirector.js
@@ -16,17 +16,17 @@ function netErrorURL() {
   try {
     uri = Services.prefs.getCharPref("b2g.neterror.url");
   } catch(e) {}
   return uri;
 }
 
 let modules = {
   certerror: {
-    uri: "chrome://browser/content/aboutCertError.xhtml",
+    uri: "chrome://b2g/content/aboutCertError.xhtml",
     privileged: false,
     hide: true
   },
   neterror: {
     uri: netErrorURL(),
     privileged: false,
     hide: true
   }
--- a/b2g/components/B2GComponents.manifest
+++ b/b2g/components/B2GComponents.manifest
@@ -1,10 +1,10 @@
 # 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
 contract @mozilla.org/system-alerts-service;1 {fe33c107-82a4-41d6-8c64-5353267e04c9}
 
 # ContentPermissionPrompt.js
 component {8c719f03-afe0-4aac-91ff-6c215895d467} ContentPermissionPrompt.js
 contract @mozilla.org/content-permission/prompt;1 {8c719f03-afe0-4aac-91ff-6c215895d467}
--- a/b2g/components/ErrorPage.jsm
+++ b/b2g/components/ErrorPage.jsm
@@ -4,17 +4,17 @@
 
 'use strict';
 
 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");
 
 XPCOMUtils.defineLazyGetter(this, "CertOverrideService", function () {
   return Cc["@mozilla.org/security/certoverride;1"]
          .getService(Ci.nsICertOverrideService);
 });
--- a/b2g/components/PaymentGlue.js
+++ b/b2g/components/PaymentGlue.js
@@ -6,17 +6,17 @@
 
 const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 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";
 const kOpenPaymentFlowEvent = "open-payment-flow-dialog";
 
 const PREF_DEBUG = "dom.payment.debug";
 
 XPCOMUtils.defineLazyServiceGetter(this, "uuidgen",
--- a/b2g/components/SignInToWebsite.jsm
+++ b/b2g/components/SignInToWebsite.jsm
@@ -95,17 +95,17 @@ let kPersonaUri = "https://firefoxos.per
 try {
   kPersonaUri = Services.prefs.getCharPref("toolkit.identity.uri");
 } catch(noSuchPref) {
   // stick with the default value
 }
 
 // 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";
 const kDoneIdentityDialog = "id-dialog-done";
 const kCloseIdentityDialog = "id-dialog-close-iframe";
 
 // Observer messages to communicate to shim
 const kIdentityDelegateWatch = "identity-delegate-watch";