diff options
| -rw-r--r-- | dom/security/nsContentSecurityManager.cpp | 2 | ||||
| -rw-r--r-- | toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dom/security/nsContentSecurityManager.cpp b/dom/security/nsContentSecurityManager.cpp index 4ee9b4877..570730312 100644 --- a/dom/security/nsContentSecurityManager.cpp +++ b/dom/security/nsContentSecurityManager.cpp @@ -303,7 +303,7 @@ DoContentSecurityChecks(nsIChannel* aChannel, nsILoadInfo* aLoadInfo) case nsIContentPolicy::TYPE_DOCUMENT: { mimeTypeGuess = EmptyCString(); - requestingContext = aLoadInfo->LoadingNode(); + requestingContext = aLoadInfo->ContextForTopLevelLoad(); break; } diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties index 9d976e0e3..370198f56 100644 --- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties +++ b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties @@ -169,7 +169,7 @@ cmd.purchaseAddon.accesskey=u eulaHeader=%S requires that you accept the following End User License Agreement before installation can proceed: type.extension.name=Extensions -type.theme.name=Appearance +type.theme.name=Themes type.locale.name=Languages type.plugin.name=Plugins type.dictionary.name=Dictionaries |