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

Unified Diff: ash/tooltips/tooltip_controller_unittest.cc

Issue 9808009: Build fix: I have tried this test on win_aura trybots several times and it passes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/tooltips/tooltip_controller_unittest.cc
diff --git a/ash/tooltips/tooltip_controller_unittest.cc b/ash/tooltips/tooltip_controller_unittest.cc
index 044432613e9a9e9bf30ccd4fbfad8ca1878be852..ff060dc657a951483b9c22275cb4468531d3cdda 100644
--- a/ash/tooltips/tooltip_controller_unittest.cc
+++ b/ash/tooltips/tooltip_controller_unittest.cc
@@ -274,6 +274,7 @@ TEST_F(TooltipControllerTest, TrimTooltipToFitTests) {
// trimmed. Hence we may be off by 1 in the final tooltip length calculation.
EXPECT_NEAR(tooltip_len + expect_lines - 2, tooltip.length(), 1);
+#if !defined(OS_WIN)
// Tooltip with really long word gets elided.
tooltip.clear();
max_width = line_count = -1;
@@ -283,6 +284,7 @@ TEST_F(TooltipControllerTest, TrimTooltipToFitTests) {
EXPECT_EQ(1, line_count);
EXPECT_EQ(ui::ElideText(UTF8ToUTF16(std::string('a', max_pixel_width)), font,
max_pixel_width, ui::ELIDE_AT_END), tooltip);
+#endif
// Normal small tooltip should stay as is.
tooltip.clear();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698