Merge mozilla-central to mozilla-inbound

2016-07-06 18:30:58 -07:00
parent 7243daa74f 124e873c7a
commit 974eae39e8
208 changed files with 2883 additions and 10618 deletions
--- a/dom/html/HTMLMediaElement.cpp
+++ b/dom/html/HTMLMediaElement.cpp
@@ -5927,7 +5927,7 @@ HTMLMediaElement::OpenUnsupportedMediaWithExtenalAppIfNeeded()
  LOG(LogLevel::Debug, ("Open unsupported type \'%s\' with external apps.",
      mMimeType.get()));
  nsContentUtils::DispatchTrustedEvent(OwnerDoc(), static_cast<nsIContent*>(this),
-                                       NS_LITERAL_STRING("OpenMediaWithExtenalApp"),
+                                       NS_LITERAL_STRING("OpenMediaWithExternalApp"),
                                       true,
                                       true);
 }