summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/toolbar_controller_unittest.mm
diff options
context:
space:
mode:
authorshess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-29 20:58:43 +0000
committershess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-29 20:58:43 +0000
commit66b2c3e610f44d27e5964dc984e088853b7dbbb8 (patch)
tree07379a7707709e251cec8d0a6e4e262a5aef0321 /chrome/browser/cocoa/toolbar_controller_unittest.mm
parent0ae690367b54477c3bd7f73a1b34199b0db15e3a (diff)
downloadchromium_src-66b2c3e610f44d27e5964dc984e088853b7dbbb8.zip
chromium_src-66b2c3e610f44d27e5964dc984e088853b7dbbb8.tar.gz
chromium_src-66b2c3e610f44d27e5964dc984e088853b7dbbb8.tar.bz2
[Mac] First pass at final sizing of toolbar items.
Toolbar.xib changes: - buttons from 31x27 to 29x29 so that the visual is 27x27. - shift things left to take up opened space. - omnibox to 29 pixels tall. - wrench also to 29x29. - all of that raised a single pixel to recenter. - swap positions of home and reload. Modify home-button-adjustment code to reflect rearranged home/reload positions. Increase Omnibox font size by one point to match increased field height (and Windows Omnibox). Revise various font clients to recognize this. Shift Omnibox baseline and other measurements to account for increased height. Shift globe/search icon in by one pixel so icons on both sides of Omnibox are 4px from border. Matching shift in popup. Fix EV-bubble to use appropriate green for text, rather than black. Push out bubble to have a single-pixel space WRT Omnibox border. Tighten corners to tuck into Omnibox corners. Handle different lhs padding versus location icon (image should end up in same spot, even though the bubble draws outside the image). BUG=50575 TEST=none Review URL: http://codereview.chromium.org/3046029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54188 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/toolbar_controller_unittest.mm')
-rw-r--r--chrome/browser/cocoa/toolbar_controller_unittest.mm5
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/cocoa/toolbar_controller_unittest.mm b/chrome/browser/cocoa/toolbar_controller_unittest.mm
index c5f155d..ed7f26a 100644
--- a/chrome/browser/cocoa/toolbar_controller_unittest.mm
+++ b/chrome/browser/cocoa/toolbar_controller_unittest.mm
@@ -161,23 +161,20 @@ TEST_F(ToolbarControllerTest, LoadingState) {
}
// Check that toggling the state of the home button changes the visible
-// state of the home button and moves the other buttons accordingly.
+// state of the home button and moves the other items accordingly.
TEST_F(ToolbarControllerTest, ToggleHome) {
PrefService* prefs = helper_.profile()->GetPrefs();
bool showHome = prefs->GetBoolean(prefs::kShowHomeButton);
NSView* homeButton = [[bar_ toolbarViews] objectAtIndex:kHomeIndex];
EXPECT_EQ(showHome, ![homeButton isHidden]);
- NSView* reloadButton = [[bar_ toolbarViews] objectAtIndex:kReloadIndex];
NSView* locationBar = [[bar_ toolbarViews] objectAtIndex:kLocationIndex];
- NSRect originalReloadFrame = [reloadButton frame];
NSRect originalLocationBarFrame = [locationBar frame];
// Toggle the pref and make sure the button changed state and the other
// views moved.
prefs->SetBoolean(prefs::kShowHomeButton, !showHome);
EXPECT_EQ(showHome, [homeButton isHidden]);
- EXPECT_NE(NSMinX(originalReloadFrame), NSMinX([reloadButton frame]));
EXPECT_NE(NSMinX(originalLocationBarFrame), NSMinX([locationBar frame]));
EXPECT_NE(NSWidth(originalLocationBarFrame), NSWidth([locationBar frame]));
}