summaryrefslogtreecommitdiffstats
path: root/ash/tooltips
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-09 23:22:09 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-09 23:22:09 +0000
commit909afe39bf16d03f7b42740747fa4c15c27c67cc (patch)
tree13e749aca7dae865497984fb1f7856bd30653732 /ash/tooltips
parent3683adf58bcf7041346f00014c8f12405ae5ef9f (diff)
downloadchromium_src-909afe39bf16d03f7b42740747fa4c15c27c67cc.zip
chromium_src-909afe39bf16d03f7b42740747fa4c15c27c67cc.tar.gz
chromium_src-909afe39bf16d03f7b42740747fa4c15c27c67cc.tar.bz2
The center of a rect is x+width/2, y+height/2
If a rect is (0, 0, 5, 5) the center should be 2.5, 2.5, not 2, 2. Tests: ui_unittests:RectTest.CenterPoint ui_unittests:RectTest.CenterPointF BUG=147395 Review URL: https://chromiumcodereview.appspot.com/11065050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160976 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/tooltips')
-rw-r--r--ash/tooltips/tooltip_controller_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/tooltips/tooltip_controller_unittest.cc b/ash/tooltips/tooltip_controller_unittest.cc
index 995f889..d48db06 100644
--- a/ash/tooltips/tooltip_controller_unittest.cc
+++ b/ash/tooltips/tooltip_controller_unittest.cc
@@ -194,7 +194,7 @@ TEST_F(TooltipControllerTest, TooltipsInMultipleViews) {
view1->bounds().CenterPoint());
FireTooltipTimer();
EXPECT_TRUE(IsTooltipVisible());
- for (int i = 0; i < 50; i++) {
+ for (int i = 0; i < 49; ++i) {
generator.MoveMouseBy(1, 0);
EXPECT_TRUE(IsTooltipVisible());
EXPECT_EQ(window,
@@ -205,7 +205,7 @@ TEST_F(TooltipControllerTest, TooltipsInMultipleViews) {
EXPECT_EQ(expected_tooltip, GetTooltipText());
EXPECT_EQ(window, GetTooltipWindow());
}
- for (int i = 0; i < 50; i++) {
+ for (int i = 0; i < 49; ++i) {
generator.MoveMouseBy(1, 0);
EXPECT_FALSE(IsTooltipVisible());
EXPECT_EQ(window,
@@ -397,7 +397,7 @@ TEST_F(TooltipControllerTest, TooltipHidesOnKeyPressAndStaysHiddenUntilChange) {
// Moving the mouse inside |view1| should not change the state of the tooltip
// or the timers.
- for (int i = 0; i < 50; i++) {
+ for (int i = 0; i < 49; i++) {
generator.MoveMouseBy(1, 0);
EXPECT_FALSE(IsTooltipVisible());
EXPECT_FALSE(IsTooltipTimerRunning());
@@ -452,7 +452,7 @@ TEST_F(TooltipControllerTest, TooltipHidesOnTimeoutAndStaysHiddenUntilChange) {
// Moving the mouse inside |view1| should not change the state of the tooltip
// or the timers.
- for (int i = 0; i < 50; i++) {
+ for (int i = 0; i < 49; ++i) {
generator.MoveMouseBy(1, 0);
EXPECT_FALSE(IsTooltipVisible());
EXPECT_FALSE(IsTooltipTimerRunning());