Jason Duell d194b9d486 Merge from m-c. ... Fair amount of merge conflicts. Biggest item was changes to nsHttpChannel from web sockets changes. Other likely suspects if things are borken: nsFrameLoader.cpp: - nsFrameLoader::EnsureMessageManager: pass "this" (orig e10s code) or nsnull (m-c) to local process call to new nsFrameMessageManager(), callback arg? Smaug said null. - only calling SetCallBackData for local case. also +r smaug. nsPrefBranch.cpp had fairly extensive merge conflicts. nsChromeRegistry had lots of changes. Dougt did most of the non-necko changes (thanks). --HG-- rename : netwerk/protocol/http/nsHttpChannel.cpp => netwerk/protocol/http/nsHttpChannelAuthProvider.cpp rename : netwerk/protocol/http/nsHttpChannel.h => netwerk/protocol/http/nsHttpChannelAuthProvider.h		2010-06-22 17:33:57 -07:00
..
tests	Merge from m-c.	2010-06-22 17:33:57 -07:00
widgets	Merge from m-c.	2010-06-22 17:33:57 -07:00
about.xhtml	Bug 435550 - In about:, move some whitespaces from the xhtml to the locale dtd [r=pike]	2010-04-20 09:34:21 +02:00
aboutAbout.xhtml	Bug 538421: Add a nsIAboutModule flag to hide 'about:' pages from about:about. r=mano, sr=bzbarsky	2010-01-23 11:07:48 +01:00
aboutRights-unbranded.xhtml	Bug 559609 Remove non-toolkit dependency from aboutRights-unbranded.xhtml. r=gavin	2010-04-16 10:33:03 +01:00
aboutRights.xhtml	Bug 541761 - change text which implies Firefox logo is under non-free copyright licence. r=kairo.	2010-04-28 10:45:51 +01:00
aboutSupport.js	Backout new add-ons manager due to Ts regression on OSX 10.5	2010-05-01 11:04:44 -07:00
aboutSupport.xhtml	Bug 518989 - Allow theming of about:support, and move the inline JS out to a separate file, r=gavin	2010-02-20 20:42:25 -08:00
buildconfig.html	Bug 538890: Improve legibility of about:buildconfig. r=gavin	2010-04-13 20:22:34 +02:00
charsetOverlay.js
charsetOverlay.xul
contentAreaUtils.js	Bug 485196 - Web page generated by POST is retried as GET when Save Frame As used, and the page is no longer in the cache. r=smaug, r=gavin	2010-06-08 03:15:00 -04:00
customizeCharset.js
customizeCharset.xul
customizeToolbar.css
customizeToolbar.js	Bug 549562 - Position the toolbar customization popup in repositionDialog() and make it invisible until it's positioned and loaded. r=gavin	2010-05-14 12:20:00 +02:00
customizeToolbar.xul
debug.js
directionDetector.html
editMenuOverlay.js
editMenuOverlay.xul
filepicker.properties	Bug 377624 - "Implement the accept attribute for the form and file upload controls form "image/*"" [r=enndeakin,roc]	2010-05-19 22:28:01 -04:00
finddialog.js
finddialog.xul	Bug 485720 Clean up including removing bogus use of flex attributes r=gavin	2010-01-31 21:36:42 +00:00
findUtils.js
globalOverlay.js
InlineSpellChecker.jsm	Bug 433860 - No spelling suggestions for text inputs when contenteditable node in document; r=gavin	2010-06-01 14:08:38 -04:00
jar.mn	Bug 533592, part 1 - Remove uses of and support for xpcnativewrappers=no/yes in manifests. (The default has been yes for some time and we will now only have that behavior.) r=mrbkap.	2010-05-27 12:33:54 -07:00
license.html	Bug 556455 - Remove liboggz, liboggplay, libfishsound from video decoder. r=doublec	2010-04-27 20:53:48 +12:00
LightweightThemeConsumer.jsm
macWindowMenu.inc	Bug 328156 - Window menu: blank line for open About box, r=mano	2010-01-05 18:35:58 -05:00
macWindowMenu.js	Bug 328156 - Window menu: blank line for open About box, r=mano	2010-01-05 18:35:58 -05:00
Makefile.in	Bug 553815. browser_Services.js and Services.jsm shouldn't fail if MOZ_TOOLKIT_SEARCH is undefined. r=gavin	2010-05-29 23:30:04 -04:00
menulist.css
mozilla.xhtml
nsDragAndDrop.js	Bug 549349: handle file:/// drops correctly, r=Mossop	2010-02-26 12:26:44 -05:00
plugins.css	Bug 180568 - Remove "Enabled" column from about:plugins. ui-r=faaborg r=jst,josh	2010-02-03 13:44:13 +01:00
plugins.html	Bug 526454 - Link to plugin check page from about:plugins. r=josh, ui-r=faaborg	2010-03-03 09:51:58 +01:00
PopupNotifications.jsm	Bug 398776: add new popup-based notification system, and use it for the geolocation notification, r=dolske, r=dao	2010-04-09 13:45:25 -04:00
Services.jsm	Bug 545714, consolidate dropped link handlers into one single component and use it for security checking, r=mano,neil,sr=sicking	2010-04-18 14:27:18 -04:00
textbox.css	Bug 547224 follow-up: Comment out -moz-placeholder use until it's actually implemented (bug 457801)	2010-03-07 22:05:01 +01:00
viewZoomOverlay.js	Bug 560018 - Actually remove support for { get property funname() { } }, confounded merging madness... r=luke	2010-04-17 03:19:33 -07:00
WindowDraggingUtils.jsm	Bug 538585, check if event is cancelled before dragging window, r=neil	2010-02-01 10:11:08 -05:00
XPCNativeWrapper.js
xul.css	Bug 364201 - Show hidden toolbars while customizing. r=enn	2010-05-27 11:01:31 +02:00