Add line height setting to views::Label & use it for notifications.

ui/gfx/canvas_unittest.cc

Index: ui/gfx/canvas_unittest.cc
diff --git a/ui/gfx/canvas_unittest.cc b/ui/gfx/canvas_unittest.cc
index ba0a0bc9004088814fcb6482be3badbd75728597..a89bd99907fe1efe1b9b3c14188f1c06f48aa9cf 100644
--- a/ui/gfx/canvas_unittest.cc
+++ b/ui/gfx/canvas_unittest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <limits>
+
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/canvas.h"
@@ -9,29 +11,54 @@
 
 namespace gfx {
 
-TEST(CanvasTest, StringWidth) {
-  const string16 text = UTF8ToUTF16("Test");
-  const int width = Canvas::GetStringWidth(text, Font());
+/* Test fixture ***************************************************************/
+
+class CanvasTest : public testing::Test {
+ protected:
+  int GetStringWidth(const char *text) {
+    return Canvas::GetStringWidth(UTF8ToUTF16(text), font_);
+  }
+
+  gfx::Size SizeStringInt(const char *text, int width, int line_height) {
+    string16 text16 = UTF8ToUTF16(text);
+    int height = 0;
+    int flags = (text16.find('\n') != string16::npos) ? Canvas::MULTI_LINE : 0;
+    Canvas::SizeStringInt(text16, font_, &width, &height, line_height, flags);
+    return gfx::Size(width, height);
+  }
 
-  EXPECT_GT(width, 0);
+ private:
+  gfx::Font font_;
+};
+
+/* Test cases *****************************************************************/
+
+TEST_F(CanvasTest, StringWidth) {
+  EXPECT_GT(GetStringWidth("Test"), 0);
 }
 
-TEST(CanvasTest, StringWidthEmptyString) {
-  const string16 text = UTF8ToUTF16("");
-  const int width = Canvas::GetStringWidth(text, Font());
+TEST_F(CanvasTest, StringWidthEmptyString) {
+  EXPECT_EQ(0, GetStringWidth(""));
+}
 
-  EXPECT_EQ(0, width);
+TEST_F(CanvasTest, StringSizeEmptyString) {
+  gfx::Size size = SizeStringInt("", 0, -1);
+  EXPECT_EQ(0, size.width());
+  EXPECT_GT(size.height(), 0);
 }
 
-TEST(CanvasTest, StringSizeEmptyString) {
-  const Font font;
-  const string16 text = UTF8ToUTF16("");
-  int width = 0;
-  int height = 0;
-  Canvas::SizeStringInt(text, font, &width, &height, 0);
+// Line height only supported on SKIA.

[Jun Mukai, 2013/04/17 17:08:57]

Not so sure but it seems to be written as 'Skia', not full capital :)

[dharcourt, 2013/04/17 17:52:21]

You're right. Fixed.

+#if defined(OS_CHROMEOS)

[Jun Mukai, 2013/04/17 17:08:57]

build/common.gypi says that canvas_skia.cc is used for all platforms except for
MAC and ANDROID. Can you change the condition to follow that?

[dharcourt, 2013/04/17 17:52:21]

Much better, thanks. Fixed.

+#define MAYBE_StringSizeWithLineHeight StringSizeWithLineHeight
+#else
+#define MAYBE_StringSizeWithLineHeight DISABLED_StringSizeWithLineHeight
+#endif
 
-  EXPECT_EQ(0, width);
-  EXPECT_GT(height, 0);
+TEST_F(CanvasTest, MAYBE_StringSizeWithLineHeight) {
+  gfx::Size one_line_size = SizeStringInt("Q", 0, -1);
+  gfx::Size four_line_size = SizeStringInt("Q\nQ\nQ\nQ", 1000000, 1000);
+  EXPECT_EQ(one_line_size.width(), four_line_size.width());
+  EXPECT_EQ(3 * 1000 + one_line_size.height(), four_line_size.height());
 }
 
 }  // namespace gfx