diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-08 23:34:07 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-08 23:34:07 +0000 |
| commit | e9adf0702e30800cdfaebce8cfacff7b444b4e79 (patch) | |
| tree | 49d8ab8fa6e0090c6dd7bbe667008f07e5939af0 /views/controls/label_unittest.cc | |
| parent | ae5f56fed71e801889db8f0f7ebd2f21d6612521 (diff) | |
| download | chromium_src-e9adf0702e30800cdfaebce8cfacff7b444b4e79.zip chromium_src-e9adf0702e30800cdfaebce8cfacff7b444b4e79.tar.gz chromium_src-e9adf0702e30800cdfaebce8cfacff7b444b4e79.tar.bz2 | |
Replace lots of "int x, int y" with gfx::Point. Also use gfx::Size and gfx::Rect in a few more places.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/669130
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40966 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/label_unittest.cc')
| -rw-r--r-- | views/controls/label_unittest.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/views/controls/label_unittest.cc b/views/controls/label_unittest.cc index 48a0419..06c159d 100644 --- a/views/controls/label_unittest.cc +++ b/views/controls/label_unittest.cc @@ -116,42 +116,42 @@ TEST(LabelTest, TooltipProperty) { label.SetText(test_text); std::wstring tooltip; - EXPECT_TRUE(label.GetTooltipText(0, 0, &tooltip)); + EXPECT_TRUE(label.GetTooltipText(gfx::Point(), &tooltip)); EXPECT_EQ(test_text, tooltip); std::wstring tooltip_text(L"The tooltip!"); label.SetTooltipText(tooltip_text); - EXPECT_TRUE(label.GetTooltipText(0, 0, &tooltip)); + EXPECT_TRUE(label.GetTooltipText(gfx::Point(), &tooltip)); EXPECT_EQ(tooltip_text, tooltip); std::wstring empty_text; label.SetTooltipText(empty_text); - EXPECT_TRUE(label.GetTooltipText(0, 0, &tooltip)); + EXPECT_TRUE(label.GetTooltipText(gfx::Point(), &tooltip)); EXPECT_EQ(test_text, tooltip); // Make the label big enough to hold the text // and expect there to be no tooltip. label.SetBounds(0, 0, 1000, 40); - EXPECT_FALSE(label.GetTooltipText(0, 0, &tooltip)); + EXPECT_FALSE(label.GetTooltipText(gfx::Point(), &tooltip)); // Verify that setting the tooltip still shows it. label.SetTooltipText(tooltip_text); - EXPECT_TRUE(label.GetTooltipText(0, 0, &tooltip)); + EXPECT_TRUE(label.GetTooltipText(gfx::Point(), &tooltip)); EXPECT_EQ(tooltip_text, tooltip); // Clear out the tooltip. label.SetTooltipText(empty_text); // Shrink the bounds and the tooltip should come back. label.SetBounds(0, 0, 1, 1); - EXPECT_TRUE(label.GetTooltipText(0, 0, &tooltip)); + EXPECT_TRUE(label.GetTooltipText(gfx::Point(), &tooltip)); // Make the label multiline and there is no tooltip again. label.SetMultiLine(true); - EXPECT_FALSE(label.GetTooltipText(0, 0, &tooltip)); + EXPECT_FALSE(label.GetTooltipText(gfx::Point(), &tooltip)); // Verify that setting the tooltip still shows it. label.SetTooltipText(tooltip_text); - EXPECT_TRUE(label.GetTooltipText(0, 0, &tooltip)); + EXPECT_TRUE(label.GetTooltipText(gfx::Point(), &tooltip)); EXPECT_EQ(tooltip_text, tooltip); // Clear out the tooltip. label.SetTooltipText(empty_text); |