398589 - Some chrome images live in resources/images/toolbar

Status: RESOLVED FIXED

(Camino Graveyard :: General, defect)

Description

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

Some of our non-toolbar chrome images live in toolbar/ instead of in chrome/. For general cleanliness and sanity in our tree, they should probably move to chrome/ with all the other non-tooolbar chrome images.

Also, brokenbookmark_icon.tif should probably be renamed either site_error_icon.tif or something generic like warning_icon_sm.tiff, since AFAIK it's only being used as the site icon for sites which trigger error pages.

From bug 360573:

4. Images which *are used* but live in the wrong place in the cvs hierarchy:

resources/images/toolbar/addressbook_icon.tif           should be in chrome
resources/images/toolbar/bm_folder.tif                  should be in chrome
resources/images/toolbar/bookmarkmenu_icon.tif          should be in chrome
resources/images/toolbar/bookmarktoolbar_icon.tif       should be in chrome
resources/images/toolbar/brokenbookmark_icon.tif        should be in chrome†
resources/images/toolbar/historyicon.tif                should be in chrome
resources/images/toolbar/rendezvous_icon.tif            should be in chrome
resources/images/toolbar/top10_icon.tif                 should be in chrome
resources/images/toolbar/bm_sep.tif                     should be in chrome‡

Comment 1

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

bm_sep.tif belongs over in bug 360573's group 3, not here. 

Comment 2

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

Attachment: fix

Project patch for the move, plus changing one line in BrowserWrapper.mm that referred to brokenbookmark_icon.tif (which I ended up calling error_page_site_icon.tif, since the error page is its only consumer now).

Amazingly, this applies on branch as well! :)

Comment 3

[Mark Mentovai]

Comment on attachment 283852 [details] [diff] [review]
fix

I trust you remember our -kb discussion.

Comment 4

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

(In reply to comment #3)
> (From update of attachment 283852 [details] [diff] [review])
> I trust you remember our -kb discussion.

Indeed.

Checked in on the trunk and the 18branch. historyicon.tif really should have been renamed history_icon.tif to keep it consistent with all those other manager collection icons while we were doing cleanup, but I didn't catch that until the checkin was done.