summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-23 17:39:04 +0000
committerrohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-23 17:39:04 +0000
commit5ce20320ef59981866de5f51ef2ddc671ea205e8 (patch)
tree010e6f109eeb994749971725bdd2636f0d4c7322
parent14fb733666a4f8a5cc4b4a032e2f30c4a4f9c170 (diff)
downloadchromium_src-5ce20320ef59981866de5f51ef2ddc671ea205e8.zip
chromium_src-5ce20320ef59981866de5f51ef2ddc671ea205e8.tar.gz
chromium_src-5ce20320ef59981866de5f51ef2ddc671ea205e8.tar.bz2
[Mac] Add the findbar template pdfs back to chrome_dll.gypi. Add a unittest to make sure the findbar images were loaded properly.
BUG=49572 TEST=Findbar buttons should have images again. Unittest should pass. Review URL: http://codereview.chromium.org/3028017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53486 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/cocoa/find_bar_cocoa_controller_unittest.mm13
-rw-r--r--chrome/chrome_dll.gypi2
2 files changed, 15 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/find_bar_cocoa_controller_unittest.mm b/chrome/browser/cocoa/find_bar_cocoa_controller_unittest.mm
index 6532371..eb5e3fc 100644
--- a/chrome/browser/cocoa/find_bar_cocoa_controller_unittest.mm
+++ b/chrome/browser/cocoa/find_bar_cocoa_controller_unittest.mm
@@ -32,6 +32,14 @@
- (FindBarTextField*)findTextField {
return findText_;
}
+
+- (NSButton*)nextButton {
+ return nextButton_;
+}
+
+- (NSButton*)previousButton {
+ return previousButton_;
+}
@end
namespace {
@@ -50,6 +58,11 @@ class FindBarCocoaControllerTest : public CocoaTest {
TEST_VIEW(FindBarCocoaControllerTest, [controller_ view])
+TEST_F(FindBarCocoaControllerTest, ImagesLoadedProperly) {
+ EXPECT_TRUE([[[controller_ nextButton] image] isValid]);
+ EXPECT_TRUE([[[controller_ previousButton] image] isValid]);
+}
+
TEST_F(FindBarCocoaControllerTest, ShowAndHide) {
NSView* findBarView = [controller_ findBarView];
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 5af7333..52550f2 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -246,6 +246,8 @@
'app/nibs/Toolbar.xib',
'app/theme/back_Template.pdf',
'app/theme/chevron.pdf',
+ 'app/theme/find_next_Template.pdf',
+ 'app/theme/find_prev_Template.pdf',
'app/theme/forward_Template.pdf',
'app/theme/home_Template.pdf',
'app/theme/menu_hierarchy_arrow.pdf',