Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(310)

Unified Diff: ui/views/corewm/tooltip_controller_unittest.cc

Issue 24883002: Uses and returns the fractional width in text eliding (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix round-down problems Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/corewm/tooltip_controller_unittest.cc
diff --git a/ui/views/corewm/tooltip_controller_unittest.cc b/ui/views/corewm/tooltip_controller_unittest.cc
index efe561d7a5bb235133bcaf6587ca6b1860c0053d..9bcc6b30fcdef11fabbe66bfe8b498830814ceb2 100644
--- a/ui/views/corewm/tooltip_controller_unittest.cc
+++ b/ui/views/corewm/tooltip_controller_unittest.cc
@@ -214,9 +214,10 @@ TEST_F(TooltipControllerTest, EnableOrDisableTooltips) {
}
TEST_F(TooltipControllerTest, TrimTooltipToFitTests) {
- const int max_width = 4000;
+ const float max_width = 4000;
string16 tooltip;
- int width, line_count, expect_lines;
+ float width;
+ int line_count, expect_lines;
int max_pixel_width = 400; // copied from constants in tooltip_controller.cc
int max_lines = 10; // copied from constants in tooltip_controller.cc
gfx::Font font = GetDefaultFont();
@@ -295,7 +296,7 @@ TEST_F(TooltipControllerTest, TrimTooltipToFitTests) {
tooltip = ASCIIToUTF16("Multi line\nTooltip");
TooltipControllerTestHelper::TrimTooltipToFit(
max_width, &tooltip, &width, &line_count);
- int expected_width = font.GetStringWidth(ASCIIToUTF16("Multi line"));
+ float expected_width = font.GetStringWidth(ASCIIToUTF16("Multi line"));
expected_width = std::max(expected_width,
font.GetStringWidth(ASCIIToUTF16("Tooltip")));
EXPECT_EQ(expected_width, width);

Powered by Google App Engine
This is Rietveld 408576698