diff options
| author | feldstein@chromium.org <feldstein@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-05 22:39:53 +0000 |
|---|---|---|
| committer | feldstein@chromium.org <feldstein@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-05 22:39:53 +0000 |
| commit | 4a4d141960653d52e80b52c92358b6f19fc21b1b (patch) | |
| tree | 7aeee684cfd0d8eba8942c538564acd3bda7d904 /chrome/app/nibs/DownloadShelf.xib | |
| parent | c5f93e4da584682e8b25ae0ca7ef1b0fc9284236 (diff) | |
| download | chromium_src-4a4d141960653d52e80b52c92358b6f19fc21b1b.zip chromium_src-4a4d141960653d52e80b52c92358b6f19fc21b1b.tar.gz chromium_src-4a4d141960653d52e80b52c92358b6f19fc21b1b.tar.bz2 | |
Fix Popup Blockers close button
The change at http://codereview.chromium.org/484006 changed all the close buttons to use a single HoverCloseButton class, but this didn't work for the popup blocker. The reason is that all the initialization was done in awakeFromNib since in most other cases, the button was created in a nib, but was done with initWithFrame for the popup blocker case. I refactored the initialization code out into -initButton to be called from both initWithFrame and awakeFromNib.
I also removed the references to the images and alt images from each of the xib files. The images are specified in the class itself so it was redundant to have it in the xibs, and could probably cause confusion if we change the images later on.
BUG=16041
TEST=Ensure that the popup blocker button has rollover image changing, and that it works correctly still for TabView, InfoBar, and DownloadShelf
Review URL: http://codereview.chromium.org/521010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35568 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/nibs/DownloadShelf.xib')
| -rw-r--r-- | chrome/app/nibs/DownloadShelf.xib | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/chrome/app/nibs/DownloadShelf.xib b/chrome/app/nibs/DownloadShelf.xib index 3ad0f9d..3eeb9ac 100644 --- a/chrome/app/nibs/DownloadShelf.xib +++ b/chrome/app/nibs/DownloadShelf.xib @@ -86,14 +86,6 @@ <reference key="NSControlView" ref="538957441"/> <int key="NSButtonFlags">142360831</int> <int key="NSButtonFlags2">6</int> - <object class="NSCustomResource" key="NSNormalImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">close_bar</string> - </object> - <object class="NSCustomResource" key="NSAlternateImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">close_bar_p</string> - </object> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> <int key="NSPeriodicDelay">200</int> |