632269 - Register chrome from profile's chrome folder (NS_APP_USER_CHROME_DIR)

Status: RESOLVED FIXED

(Camino Graveyard :: General, defect)

Description

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

dirserviceprovider's nsProfileDirServiceProvider.cpp, which ends up as part of our libprofdirserviceprovider_s.a, *defines* NS_APP_USER_CHROME_DIR (the profile's chrome folder), which (along with the way that nsLayoutStylesheetCache.cpp references the user*.css files) is why userContent.css continues to work in the Camino+1.9.2 world, but, as outlined in bug 632261 comment 0, the toolkit chrome registry doesn't *register chrome* from that folder.

Fortunately, the fix here is simple; just add NS_APP_USER_CHROME_DIR to NS_CHROME_MANIFESTS_FILE_LIST so that the toolkit chrome registry will enumerate manifests in that directory when it enumerates the other manifests.

Comment 1

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

Attachment: Add NS_APP_USER_CHROME_DIR to the NS_CHROME_MANIFESTS_FILE_LIST

Stuart, when you wrote the code I copied here in bug 457290, you checked |NS_ENSURE_SUCCESS(rv, rv);| after appending both the lproj and the bundle's internal chrome folder; after the patch for bug 634398, you only check it after appending the lproj.

I added back the check after appending the internal chrome folder when I added the copied code so that all three are checked, but let me know what the right thing to do is ;)

Comment 2

[Stuart Morgan]

Comment on attachment 513784 [details] [diff] [review]
Add NS_APP_USER_CHROME_DIR to the NS_CHROME_MANIFESTS_FILE_LIST

Yeah, that was a mistake (although if that ever fails something is probably already very wrong ;).

sr=smorgan

Comment 3

[Smokey Ardisson (offline for a while; not following bugs - do not email)]

This got landed as part of bug 632261's checkin, because this patch really needed the folder-creation code added there, and it just got to be a mess to keep untangling the patches every time I had to change something ;-)

So fixed by http://hg.mozilla.org/camino/rev/a4313852d465