282057 - brand.dtd/brand.properties live in the wrong package!

Status: RESOLVED FIXED

(Toolkit :: Startup and Profile System, defect, P1)

Description

[Benjamin Smedberg]

brand.dtd and brand.properties live in chrome://global, which is terribly bad.
It means that xulrunner apps cannot insert their own brand.dtd/properties, which
means they can't use many of the advanced toolkit code like EM/update/whatever.
There should be a chrome://application package which each app is required to
register so that the toolkit can find the application name.

For backwards compatibility with existing extensions, I'm going to have DTD
references from chrome://global/locale/brand.dtd to
chrome://application/locale/brand.dtd

Comment 1

[Benjamin Smedberg]

The plan has changed slightly, I am moving this files to a package named
chrome://branding/, which is the only chrome package affected by
--enable-official-branding (note that there are non-chrome things affected by
that flag as well).

Comment 2

[Benjamin Smedberg]

Comitted on trunk, with a global
s|chrome://global/locale/brand\.properties|chrome://branding/locale/brand.properties|

I will do a global
s|chrome://global/locale/brand\.dtd|chrome://branding/locale/brand.dtd| shortly,
but because of the way DTD files are structured, I was able to add a
compatibility hack such that the old chrome://global/locale/brand.dtd location
will still work.

Comment 3

[Benjamin Smedberg]

There was a small error in this patch which means that thunderbird nightlies
from today (3/10) may start with XML parsing errors. This has been fixed, no
need to file another bug.

Comment 4

[Scott MacGregor]

Hi Benjamin, I've got a debug thunderbird build from a few hours ago and all of
the branding in it says "Mail/News" instead of Thunderbird. Are we still missing
a change somewhere? 

Comment 5

[Scott MacGregor]

In addition to the thunderbird errors mentioned above, I also get this error on
startup:

*** Failed to get string brandShortName in bundle: chrome://global/locale/brand.
properties
error setting title: [Exception... "Component returned failure code: 0x80004005
(NS_ERROR_FAILURE) [nsIStringBundle.GetStringFromName]"  nsresult: "0x80004005 (
NS_ERROR_FAILURE)"  location: "JS frame :: XStringBundle :: getString :: line 17
"  data: no]
--DOMWINDOW == 4


re-opening the bug to track these regressions. 

Comment 6

[Doug Halamay]

Definitely something going wrong here...Firefox now calls itself "Gecko Browser":

See here: http://forums.mozillazine.org/viewtopic.php?t=232846

Comment 7

[Mike Connor [:mconnor]]

I built Firefox from a clean checkout at around 3 PM PST and I get the proper
branding.  is --enable-official-branding set for the affected builds?

This also changed the old brand.dtd values which still read "Firefox" and
"Thunderbird" into generic equivalents so building without the official flag
actually builds something generic.  For Thunderbird it is indeed Mail/News, see
http://lxr.mozilla.org/seamonkey/source/mail/locales/en-US/chrome/branding/

Comment 8

[Benjamin Smedberg]

"Gecko browser" is a generic name for Firefox when you do not have
--enable-official-branding set. This begins to fix the trademark issue by moving
the Mozilla Foundation trademarks into the other-licenses directory. There are
still various "Firefox" strings hardcoded in various parts of browser/* which
will need to be looked at.

I am fixing the two remaining references to global/locale/brand.* imminently
(they were from the prefwindow landing, which happened after my global search
and replace).

Comment 9

[Scott MacGregor]

I just did another clean build a few minutes ago and I'm still getting the same
exception errors I reported before when I re-opened this bug. Did you fix that
issue when you reclosed it?

*** Failed to get string brandShortName in bundle: chrome://global/locale/brand.
properties
************************************************************
* Call to xpconnect wrapped JSObject produced this error:  *
[Exception... "Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [n
sIStringBundle.GetStringFromName]"  nsresult: "0x80004005 (NS_ERROR_FAILURE)"  l
ocation: "JS frame :: XStringBundle :: getString :: line 17"  data: no]
************************************************************

The weird thing is that I see brandShortName listed in brand.properties but the
string bundle fails to find it. 

Comment 10

[Scott MacGregor]

ooops I wasn't actually running the clean tree I just built. this issue does
look fixed.

Comment 11

[Scott MacGregor]

I think the changes to mozilla\toolkit\pinstripe\global.css caused a Thunderbird
OS X regression: Bug #286483