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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/views/controls/label_unittest.cc

Issue 11377005: Replace Label::Alignment with gfx::HorizontalAlignment (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix remaining Label::Alignment references. Created 8 years, 1 month 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 | « ui/views/controls/label.cc ('k') | ui/views/controls/message_box_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/label_unittest.cc
diff --git a/ui/views/controls/label_unittest.cc b/ui/views/controls/label_unittest.cc
index 12bc7fe4501fd02424e417ce48e70ddbe2da56fb..f4bd25a1117b5350174ce0e84082ff1357004572 100644
--- a/ui/views/controls/label_unittest.cc
+++ b/ui/views/controls/label_unittest.cc
@@ -59,26 +59,24 @@ TEST(LabelTest, AlignmentProperty) {
Label label;
bool reverse_alignment = base::i18n::IsRTL();
- label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
- EXPECT_EQ(
- reverse_alignment ? Label::ALIGN_LEFT : Label::ALIGN_RIGHT,
- label.horizontal_alignment());
- label.SetHorizontalAlignment(Label::ALIGN_LEFT);
- EXPECT_EQ(
- reverse_alignment ? Label::ALIGN_RIGHT : Label::ALIGN_LEFT,
- label.horizontal_alignment());
- label.SetHorizontalAlignment(Label::ALIGN_CENTER);
- EXPECT_EQ(Label::ALIGN_CENTER, label.horizontal_alignment());
+ label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
+ EXPECT_EQ(reverse_alignment ? gfx::ALIGN_LEFT : gfx::ALIGN_RIGHT,
+ label.horizontal_alignment());
+ label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
+ EXPECT_EQ(reverse_alignment ? gfx::ALIGN_RIGHT : gfx::ALIGN_LEFT,
+ label.horizontal_alignment());
+ label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
+ EXPECT_EQ(gfx::ALIGN_CENTER, label.horizontal_alignment());
// The label's alignment should not be flipped if the directionality mode is
// AUTO_DETECT_DIRECTIONALITY.
label.set_directionality_mode(Label::AUTO_DETECT_DIRECTIONALITY);
- label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
- EXPECT_EQ(Label::ALIGN_RIGHT, label.horizontal_alignment());
- label.SetHorizontalAlignment(Label::ALIGN_LEFT);
- EXPECT_EQ(Label::ALIGN_LEFT, label.horizontal_alignment());
- label.SetHorizontalAlignment(Label::ALIGN_CENTER);
- EXPECT_EQ(Label::ALIGN_CENTER, label.horizontal_alignment());
+ label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
+ EXPECT_EQ(gfx::ALIGN_RIGHT, label.horizontal_alignment());
+ label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
+ EXPECT_EQ(gfx::ALIGN_LEFT, label.horizontal_alignment());
+ label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
+ EXPECT_EQ(gfx::ALIGN_CENTER, label.horizontal_alignment());
}
TEST(LabelTest, DirectionalityModeProperty) {
@@ -336,7 +334,7 @@ TEST(LabelTest, DrawSingleLineString) {
EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY, flags);
// Left aligned text.
- label.SetHorizontalAlignment(Label::ALIGN_LEFT);
+ label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
paint_text.clear();
text_bounds.SetRect(0, 0, 0, 0);
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
@@ -349,7 +347,7 @@ TEST(LabelTest, DrawSingleLineString) {
EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY, flags);
// Right aligned text.
- label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
+ label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
paint_text.clear();
text_bounds.SetRect(0, 0, 0, 0);
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
@@ -379,7 +377,7 @@ TEST(LabelTest, DrawSingleLineString) {
required_size_with_border.height() + extra.height());
// Centered text with border.
- label.SetHorizontalAlignment(Label::ALIGN_CENTER);
+ label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
paint_text.clear();
text_bounds.SetRect(0, 0, 0, 0);
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
@@ -392,7 +390,7 @@ TEST(LabelTest, DrawSingleLineString) {
EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY, flags);
// Left aligned text with border.
- label.SetHorizontalAlignment(Label::ALIGN_LEFT);
+ label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
paint_text.clear();
text_bounds.SetRect(0, 0, 0, 0);
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
@@ -405,7 +403,7 @@ TEST(LabelTest, DrawSingleLineString) {
EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY, flags);
// Right aligned text.
- label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
+ label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
paint_text.clear();
text_bounds.SetRect(0, 0, 0, 0);
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
@@ -459,7 +457,7 @@ TEST(LabelTest, DrawMultiLineString) {
#endif
gfx::Rect center_bounds(text_bounds);
- label.SetHorizontalAlignment(Label::ALIGN_LEFT);
+ label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
paint_text.clear();
text_bounds.SetRect(0, 0, 0, 0);
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
@@ -477,7 +475,7 @@ TEST(LabelTest, DrawMultiLineString) {
EXPECT_EQ(expected_flags | gfx::Canvas::NO_ELLIPSIS, flags);
#endif
- label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
+ label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
paint_text.clear();
text_bounds.SetRect(0, 0, 0, 0);
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
@@ -507,7 +505,7 @@ TEST(LabelTest, DrawMultiLineString) {
label.width() + extra.width(),
label.height() + extra.height());
- label.SetHorizontalAlignment(Label::ALIGN_CENTER);
+ label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
paint_text.clear();
text_bounds.SetRect(0, 0, 0, 0);
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
@@ -525,7 +523,7 @@ TEST(LabelTest, DrawMultiLineString) {
EXPECT_EQ(expected_flags | gfx::Canvas::NO_ELLIPSIS, flags);
#endif
- label.SetHorizontalAlignment(Label::ALIGN_LEFT);
+ label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
paint_text.clear();
text_bounds.SetRect(0, 0, 0, 0);
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
@@ -543,7 +541,7 @@ TEST(LabelTest, DrawMultiLineString) {
EXPECT_EQ(expected_flags | gfx::Canvas::NO_ELLIPSIS, flags);
#endif
- label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
+ label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
paint_text.clear();
text_bounds.SetRect(0, 0, 0, 0);
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
@@ -594,7 +592,7 @@ TEST(LabelTest, DrawSingleLineStringInRTL) {
EXPECT_EQ(0, flags);
// ALIGN_LEFT label.
- label.SetHorizontalAlignment(Label::ALIGN_LEFT);
+ label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
paint_text.clear();
text_bounds.SetRect(0, 0, 0, 0);
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
@@ -607,7 +605,7 @@ TEST(LabelTest, DrawSingleLineStringInRTL) {
EXPECT_EQ(0, flags);
// ALIGN_RIGHT label.
- label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
+ label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
paint_text.clear();
text_bounds.SetRect(0, 0, 0, 0);
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
@@ -638,7 +636,7 @@ TEST(LabelTest, DrawSingleLineStringInRTL) {
required_size_with_border.height() + extra.height());
// Centered text with border.
- label.SetHorizontalAlignment(Label::ALIGN_CENTER);
+ label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
paint_text.clear();
text_bounds.SetRect(0, 0, 0, 0);
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
@@ -651,7 +649,7 @@ TEST(LabelTest, DrawSingleLineStringInRTL) {
EXPECT_EQ(0, flags);
// ALIGN_LEFT text with border.
- label.SetHorizontalAlignment(Label::ALIGN_LEFT);
+ label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
paint_text.clear();
text_bounds.SetRect(0, 0, 0, 0);
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
@@ -664,7 +662,7 @@ TEST(LabelTest, DrawSingleLineStringInRTL) {
EXPECT_EQ(0, flags);
// ALIGN_RIGHT text.
- label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
+ label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
paint_text.clear();
text_bounds.SetRect(0, 0, 0, 0);
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
@@ -722,7 +720,7 @@ TEST(LabelTest, DrawMultiLineStringInRTL) {
#endif
gfx::Rect center_bounds(text_bounds);
- label.SetHorizontalAlignment(Label::ALIGN_LEFT);
+ label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
paint_text.clear();
text_bounds.SetRect(0, 0, 0, 0);
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
@@ -741,7 +739,7 @@ TEST(LabelTest, DrawMultiLineStringInRTL) {
flags);
#endif
- label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
+ label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
paint_text.clear();
text_bounds.SetRect(0, 0, 0, 0);
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
@@ -772,7 +770,7 @@ TEST(LabelTest, DrawMultiLineStringInRTL) {
label.width() + extra.width(),
label.height() + extra.height());
- label.SetHorizontalAlignment(Label::ALIGN_CENTER);
+ label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
paint_text.clear();
text_bounds.SetRect(0, 0, 0, 0);
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
@@ -791,7 +789,7 @@ TEST(LabelTest, DrawMultiLineStringInRTL) {
flags);
#endif
- label.SetHorizontalAlignment(Label::ALIGN_LEFT);
+ label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
paint_text.clear();
text_bounds.SetRect(0, 0, 0, 0);
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
@@ -810,7 +808,7 @@ TEST(LabelTest, DrawMultiLineStringInRTL) {
flags);
#endif
- label.SetHorizontalAlignment(Label::ALIGN_RIGHT);
+ label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
paint_text.clear();
text_bounds.SetRect(0, 0, 0, 0);
label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags);
« no previous file with comments | « ui/views/controls/label.cc ('k') | ui/views/controls/message_box_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698