Commit f8b11433 authored by Dorel Luca's avatar Dorel Luca
Browse files

Merge mozilla-inbound to mozilla-central a=merge

parents dd221379 e73b26a8

browser/base/content/browser.xhtml

+1378 −3

File changed.

Preview size limit exceeded, changes collapsed.

browser/base/content/browser.xul

deleted100644 → 0
+0 −1379

File deleted.

Preview size limit exceeded, changes collapsed.

browser/base/content/global-scripts.inc

+5 −5
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ 
# 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/.



# JS files which are needed by browser.xul but no other top level windows to

# support MacOS specific features should be loaded directly from browser.xul

# JS files which are needed by browser.xhtml but no other top level windows to

# support MacOS specific features should be loaded directly from browser.xhtml

# rather than this file.



# If you update this list, you may need to add a mapping within the following
@@ -19,8 +19,8 @@ Services.scriptloader.loadSubScript("chrome://browser/content/browser-places.js" 
Services.scriptloader.loadSubScript("chrome://global/content/globalOverlay.js", this);

Services.scriptloader.loadSubScript("chrome://global/content/editMenuOverlay.js", this);

Services.scriptloader.loadSubScript("chrome://browser/content/utilityOverlay.js", this);

#ifdef XP_MACOSX

if (AppConstants.platform == "macosx") {

  Services.scriptloader.loadSubScript("chrome://global/content/macWindowMenu.js", this);

#endif

}



</script>

browser/base/content/macWindow.inc.xul

+6 −6
Original line number Diff line number Diff line
@@ -6,22 +6,22 @@ 


# This include file should only contain things that are needed to support MacOS

# specific features that are needed for all top level windows. If the feature is

# also needed in browser.xul, it should go in one of the various include files

# below that are shared with browser.xul. When including this file,

# also needed in browser.xhtml, it should go in one of the various include files

# below that are shared with browser.xhtml. When including this file,

# browser-doctype.inc must also be included.



# All JS files which are needed by browser.xul and other top level windows to

# All JS files which are needed by browser.xhtml and other top level windows to

# support MacOS specific features *must* go into the global-scripts.inc file so

# that they can be shared with browser.xul.

# that they can be shared with browser.xhtml.

#include global-scripts.inc



<script src="chrome://browser/content/nonbrowser-mac.js"></script>



# All sets except for popupsets (commands, keys, and stringbundles)

# *must* go into the browser-sets.inc file so that they can be shared with

# browser.xul

# browser.xhtml

#include browser-sets.inc



# The entire main menubar is placed into browser-menubar.inc, so that it can be

# shared with browser.xul.

# shared with browser.xhtml.

#include browser-menubar.inc

browser/base/content/test/static/browser_all_files_referenced.js

+1 −1
Original line number Diff line number Diff line
@@ -703,7 +703,7 @@ add_task(async function checkAllTheFiles() { 
  }



  if (isDevtools) {

    // chrome://devtools/skin/devtools-browser.css is included from browser.xul

    // chrome://devtools/skin/devtools-browser.css is included from browser.xhtml

    gReferencesFromCode.set(AppConstants.BROWSER_CHROME_URL, null);

    // devtools' css is currently included from browser.css, see bug 1204810.

    gReferencesFromCode.set("chrome://browser/skin/browser.css", null);