summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-20 04:48:48 +0000
committersail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-20 04:48:48 +0000
commit1911ab0a3b41bb2281a637c5d4795c0e964163cd (patch)
tree4456f9f4efaa3bb272be4643bdd3bd1af21c65fe
parentc99037d1bad96b729e015a84ca19e5a144689ccd (diff)
downloadchromium_src-1911ab0a3b41bb2281a637c5d4795c0e964163cd.zip
chromium_src-1911ab0a3b41bb2281a637c5d4795c0e964163cd.tar.gz
chromium_src-1911ab0a3b41bb2281a637c5d4795c0e964163cd.tar.bz2
Fix failing Mac unit tests
My previous change (r82236) to toolbar buttons was missing a few files. This caused the unit tests to fail. BUG=None TEST=None Review URL: http://codereview.chromium.org/6879073 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82239 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/cocoa/extensions/chevron_menu_button_unittest.mm1
-rw-r--r--chrome/browser/ui/cocoa/new_tab_button.mm5
2 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/ui/cocoa/extensions/chevron_menu_button_unittest.mm b/chrome/browser/ui/cocoa/extensions/chevron_menu_button_unittest.mm
index 4336c49c..0920592 100644
--- a/chrome/browser/ui/cocoa/extensions/chevron_menu_button_unittest.mm
+++ b/chrome/browser/ui/cocoa/extensions/chevron_menu_button_unittest.mm
@@ -34,7 +34,6 @@ TEST_F(ChevronMenuButtonTest, CellSubclass) {
// Test both hovered and non-hovered display.
TEST_F(ChevronMenuButtonTest, HoverAndNonHoverDisplay) {
ChevronMenuButtonCell* cell = [button_ cell];
- EXPECT_FALSE([cell showsBorderOnlyWhileMouseInside]);
EXPECT_FALSE([cell isMouseInside]);
[cell setShowsBorderOnlyWhileMouseInside:YES];
diff --git a/chrome/browser/ui/cocoa/new_tab_button.mm b/chrome/browser/ui/cocoa/new_tab_button.mm
index 6a97d3b..ad719b8 100644
--- a/chrome/browser/ui/cocoa/new_tab_button.mm
+++ b/chrome/browser/ui/cocoa/new_tab_button.mm
@@ -3,9 +3,14 @@
// found in the LICENSE file.
#import "chrome/browser/ui/cocoa/new_tab_button.h"
+#import "chrome/browser/ui/cocoa/image_button_cell.h"
@implementation NewTabButton
++ (Class)cellClass {
+ return [ImageButtonCell class];
+}
+
// Approximate the shape. It doesn't need to be perfect. This will need to be
// updated if the size or shape of the icon ever changes.
// TODO(pinkerton): use a click mask image instead of hard-coding points.