Commit 53af4f86 authored by Wes Kocher's avatar Wes Kocher
Browse files

Merge m-c to b2ginbound a=merge

parents 11863a3c 517ab314

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ TAGS 
tags

ID

.DS_Store*

*.pdb



# Vim swap files.

.*.sw[a-z]

b2g/installer/package-manifest.in

+28 −28
Original line number Diff line number Diff line
@@ -145,34 +145,33 @@ 
#endif

@RESPATH@/components/accessibility.xpt

#endif

@RESPATH@/components/appshell.xpt

@RESPATH@/components/appstartup.xpt

@RESPATH@/components/autocomplete.xpt

@RESPATH@/components/autoconfig.xpt

@RESPATH@/components/browsercompsbase.xpt

@RESPATH@/components/browser-element.xpt

@RESPATH@/components/browser-feeds.xpt

@RESPATH@/components/caps.xpt

@RESPATH@/components/chardet.xpt

@RESPATH@/components/chrome.xpt

@RESPATH@/components/commandhandler.xpt

@RESPATH@/components/commandlines.xpt

@RESPATH@/components/compartments.xpt

@RESPATH@/components/composer.xpt

@RESPATH@/components/content_events.xpt

@RESPATH@/components/content_html.xpt

@RESPATH@/components/content_xslt.xpt

@RESPATH@/components/cookie.xpt

@RESPATH@/components/devtools_security.xpt

@RESPATH@/components/directory.xpt

@RESPATH@/components/diskspacewatcher.xpt

@RESPATH@/components/docshell.xpt

@RESPATH@/components/dom.xpt

@RESPATH@/components/dom_activities.xpt

@RESPATH@/components/dom_apps.xpt

@RESPATH@/components/dom_audiochannel.xpt

@RESPATH@/components/dom_base.xpt

@RESPATH@/components/dom_system.xpt

@BINPATH@/components/appshell.xpt

@BINPATH@/components/appstartup.xpt

@BINPATH@/components/autocomplete.xpt

@BINPATH@/components/autoconfig.xpt

@BINPATH@/components/browsercompsbase.xpt

@BINPATH@/components/browser-element.xpt

@BINPATH@/components/browser-feeds.xpt

@BINPATH@/components/caps.xpt

@BINPATH@/components/chardet.xpt

@BINPATH@/components/chrome.xpt

@BINPATH@/components/commandhandler.xpt

@BINPATH@/components/commandlines.xpt

@BINPATH@/components/composer.xpt

@BINPATH@/components/content_events.xpt

@BINPATH@/components/content_html.xpt

@BINPATH@/components/content_xslt.xpt

@BINPATH@/components/cookie.xpt

@BINPATH@/components/devtools_security.xpt

@BINPATH@/components/directory.xpt

@BINPATH@/components/diskspacewatcher.xpt

@BINPATH@/components/docshell.xpt

@BINPATH@/components/dom.xpt

@BINPATH@/components/dom_activities.xpt

@BINPATH@/components/dom_apps.xpt

@BINPATH@/components/dom_audiochannel.xpt

@BINPATH@/components/dom_base.xpt

@BINPATH@/components/dom_system.xpt

#ifdef MOZ_WIDGET_GONK

@RESPATH@/components/dom_wifi.xpt

@RESPATH@/components/dom_system_gonk.xpt
@@ -326,6 +325,7 @@ 
@RESPATH@/components/toolkit_finalizationwitness.xpt

@RESPATH@/components/toolkit_formautofill.xpt

@RESPATH@/components/toolkit_osfile.xpt

@RESPATH@/components/toolkit_perfmonitoring.xpt

@RESPATH@/components/toolkit_xulstore.xpt

@RESPATH@/components/toolkitprofile.xpt

#ifdef MOZ_ENABLE_XREMOTE

browser/base/content/tabbrowser.xml

+1 −2
Original line number Diff line number Diff line
@@ -3779,8 +3779,7 @@ 
                                        };

              let popup = browser.ownerDocument.getElementById("contentAreaContextMenu");

              let event = gContextMenuContentData.event;

              let pos = browser.mapScreenCoordinatesFromContent(event.screenX, event.screenY);

              popup.openPopupAtScreen(pos.x, pos.y, true);

              popup.openPopupAtScreen(event.screenX, event.screenY, true);

              break;

            }

            case "DOMWebNotificationClicked": {

browser/base/content/test/general/test_contextmenu_input.html

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ function waitForEvents(event) 
  if (painted && loaded) {

    subwindow.removeEventListener("MozAfterPaint", waitForEvents, false);

    subwindow.onload = null;

    startTest();

    SimpleTest.waitForFocus(startTest, subwindow);

  }

}

browser/base/content/test/social/browser_addons.js

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


let AddonManager = Cu.import("resource://gre/modules/AddonManager.jsm", {}).AddonManager;

let SocialService = Cu.import("resource://gre/modules/SocialService.jsm", {}).SocialService;

let AddonWatcher = Cu.import("resource://gre/modules/AddonWatcher.jsm", {}).AddonWatcher;



const ADDON_TYPE_SERVICE     = "service";

const ID_SUFFIX              = "@services.mozilla.org";