Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Byg 273182 Don't apply appversion, appname or platform overrides to chrome users of the navigator object r+sr=jst

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@166386 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
neil%parkwaycc.co.uk
2004-12-07 09:04:49 +00:00
parent 2080bb82ad
commit f185848976
1 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
mozilla/dom/src/base/nsGlobalWindow.cpp
View File

@@ -5881,12 +5881,14 @@ NavigatorImpl::GetAppCodeName(nsAString& aAppCodeName)
NS_IMETHODIMP
NavigatorImpl::GetAppVersion(nsAString& aAppVersion)
{
const nsAdoptingCString& override =
nsContentUtils::GetCharPref("general.appversion.override");
if (!GlobalWindowImpl::IsCallerChrome()) {
const nsAdoptingCString& override =
nsContentUtils::GetCharPref("general.appversion.override");
if (override) {
CopyASCIItoUTF16(override, aAppVersion);
return NS_OK;
if (override) {
CopyUTF8toUTF16(override, aAppVersion);
return NS_OK;
}
}
nsresult rv;
@@ -5923,11 +5925,14 @@ NavigatorImpl::GetAppVersion(nsAString& aAppVersion)
NS_IMETHODIMP
NavigatorImpl::GetAppName(nsAString& aAppName)
{
const nsAdoptingCString& override =
nsContentUtils::GetCharPref("general.appname.override");
if (override) {
CopyASCIItoUTF16(override, aAppName);
return NS_OK;
if (!GlobalWindowImpl::IsCallerChrome()) {
const nsAdoptingCString& override =
nsContentUtils::GetCharPref("general.appname.override");
if (override) {
CopyUTF8toUTF16(override, aAppName);
return NS_OK;
}
}
aAppName.AssignLiteral("Netscape");
@@ -5952,11 +5957,14 @@ NavigatorImpl::GetLanguage(nsAString& aLanguage)
NS_IMETHODIMP
NavigatorImpl::GetPlatform(nsAString& aPlatform)
{
const nsAdoptingCString& override =
nsContentUtils::GetCharPref("general.platform.override");
if (override) {
CopyASCIItoUTF16(override, aPlatform);
return NS_OK;
if (!GlobalWindowImpl::IsCallerChrome()) {
const nsAdoptingCString& override =
nsContentUtils::GetCharPref("general.platform.override");
if (override) {
CopyUTF8toUTF16(override, aPlatform);
return NS_OK;
}
}
nsresult rv;