Replace Label::Alignment with gfx::HorizontalAlignment.

Also remove unnecessary center alignment specifications in:
ash/wm/maximize_bubble_controller.cc
chrome/browser/ui/views/find_bar_view.cc
chrome/browser/ui/views/panels/panel_frame_view.cc
chrome/browser/ui/views/speech_recognition_bubble_views.cc
ui/message_center/message_center_bubble.cc

BUG=90426,155526
TEST=No behavioral changes.
R=sky@chromium.org

Review URL: https://chromiumcodereview.appspot.com/11377005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166462 0039d316-1c4b-4281-b951-d872f2087c98

13 files changed, 88 insertions, 89 deletions

diff --git a/ui/message_center/base_format_view.cc b/ui/message_center/base_format_view.cc
index eed11f4..942d42a 100644
--- a/ui/message_center/base_format_view.cc
+++ b/ui/message_center/base_format_view.cc
@@ -41,17 +41,17 @@ void BaseFormatView::SetUpView() {
   icon_->SetImage(notification_.image);
 
   views::Label* title = new views::Label(notification_.title);
-  title->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+  title->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   title->SetFont(title->font().DeriveFont(0, gfx::Font::BOLD));
 
   views::Label* extra_field = new views::Label(notification_.extra_field);
-  extra_field->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+  extra_field->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   views::Label* second_extra_field =
       new views::Label(notification_.second_extra_field);
-  second_extra_field->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+  second_extra_field->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 
   views::Label* message = new views::Label(notification_.message);
-  message->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+  message->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   message->SetMultiLine(true);
 
   close_button_ = new views::ImageButton(this);
diff --git a/ui/message_center/message_center_bubble.cc b/ui/message_center/message_center_bubble.cc
index 31ea395..db47038 100644
--- a/ui/message_center/message_center_bubble.cc
+++ b/ui/message_center/message_center_bubble.cc
@@ -209,7 +209,6 @@ class MessageCenterContentsView : public views::View {
       views::Label* label = new views::Label(l10n_util::GetStringUTF16(
           IDS_MESSAGE_CENTER_NO_MESSAGES));
       label->SetFont(label->font().DeriveFont(1));
-      label->SetHorizontalAlignment(views::Label::ALIGN_CENTER);
       label->SetEnabledColor(SK_ColorGRAY);
       scroll_content_->AddChildView(label);
       button_view_->SetCloseAllVisible(false);
diff --git a/ui/message_center/message_simple_view.cc b/ui/message_center/message_simple_view.cc
index 39f2ab288..46c5941 100644
--- a/ui/message_center/message_simple_view.cc
+++ b/ui/message_center/message_simple_view.cc
@@ -39,10 +39,10 @@ void MessageSimpleView::SetUpView() {
   icon_->SetImage(notification_.image);
 
   views::Label* title = new views::Label(notification_.title);
-  title->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+  title->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   title->SetFont(title->font().DeriveFont(0, gfx::Font::BOLD));
   views::Label* message = new views::Label(notification_.message);
-  message->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+  message->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   message->SetMultiLine(true);
 
   close_button_ = new views::ImageButton(this);
diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc
index 887fbe9..a2c77fe0 100644
--- a/ui/views/controls/button/label_button.cc
+++ b/ui/views/controls/button/label_button.cc
@@ -44,7 +44,7 @@ LabelButton::LabelButton(ButtonListener* listener, const string16& text)
 
   AddChildView(label_);
   label_->SetAutoColorReadabilityEnabled(false);
-  label_->SetHorizontalAlignment(Label::ALIGN_LEFT);
+  label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 
   // Initialize the colors, border, and layout for a Views-themed button.
   SetNativeTheme(false);
@@ -95,11 +95,11 @@ void LabelButton::SetFont(const gfx::Font& font) {
   label_->SetFont(font);
 }
 
-Label::Alignment LabelButton::GetHorizontalAlignment() const {
+gfx::HorizontalAlignment LabelButton::GetHorizontalAlignment() const {
   return label_->horizontal_alignment();
 }
 
-void LabelButton::SetHorizontalAlignment(Label::Alignment alignment) {
+void LabelButton::SetHorizontalAlignment(gfx::HorizontalAlignment alignment) {
   label_->SetHorizontalAlignment(alignment);
   InvalidateLayout();
 }
@@ -183,7 +183,7 @@ void LabelButton::Layout() {
   gfx::Size label_size(child_area.size());
   if (!image_size.IsEmpty() && !label_size.IsEmpty()) {
     label_size.set_width(child_area.width() - image_size.width() - kSpacing);
-    if (GetHorizontalAlignment() == Label::ALIGN_CENTER) {
+    if (GetHorizontalAlignment() == gfx::ALIGN_CENTER) {
       label_size.set_width(std::min(label_size.width(),
                                     label_->GetPreferredSize().width()));
     }
@@ -191,16 +191,16 @@ void LabelButton::Layout() {
 
   gfx::Point image_origin(child_area.origin());
   image_origin.Offset(0, (child_area.height() - image_size.height()) / 2);
-  if (GetHorizontalAlignment() == Label::ALIGN_CENTER) {
+  if (GetHorizontalAlignment() == gfx::ALIGN_CENTER) {
     const int total_width = image_size.width() + label_size.width() +
         ((image_size.width() > 0 && label_size.width() > 0) ? kSpacing : 0);
     image_origin.Offset((child_area.width() - total_width) / 2, 0);
-  } else if (GetHorizontalAlignment() == Label::ALIGN_RIGHT) {
+  } else if (GetHorizontalAlignment() == gfx::ALIGN_RIGHT) {
     image_origin.Offset(child_area.width() - image_size.width(), 0);
   }
 
   gfx::Point label_origin(child_area.origin());
-  if (!image_size.IsEmpty() && GetHorizontalAlignment() != Label::ALIGN_RIGHT)
+  if (!image_size.IsEmpty() && GetHorizontalAlignment() != gfx::ALIGN_RIGHT)
     label_origin.set_x(image_origin.x() + image_size.width() + kSpacing);
 
   image_->SetBoundsRect(gfx::Rect(image_origin, image_size));
diff --git a/ui/views/controls/button/label_button.h b/ui/views/controls/button/label_button.h
index 258f1a6..e328dc5 100644
--- a/ui/views/controls/button/label_button.h
+++ b/ui/views/controls/button/label_button.h
@@ -45,8 +45,8 @@ class VIEWS_EXPORT LabelButton : public CustomButton,
 
   // Get or set the horizontal alignment used for the button.
   // The optional image will lead the text, unless the button is right-aligned.
-  Label::Alignment GetHorizontalAlignment() const;
-  void SetHorizontalAlignment(Label::Alignment alignment);
+  gfx::HorizontalAlignment GetHorizontalAlignment() const;
+  void SetHorizontalAlignment(gfx::HorizontalAlignment alignment);
 
   // Call set_min_size(gfx::Size()) to clear the monotonically increasing size.
   void set_min_size(const gfx::Size& min_size) { min_size_ = min_size; }
diff --git a/ui/views/controls/button/label_button_unittest.cc b/ui/views/controls/button/label_button_unittest.cc
index d251be1..b043f52 100644
--- a/ui/views/controls/button/label_button_unittest.cc
+++ b/ui/views/controls/button/label_button_unittest.cc
@@ -35,7 +35,7 @@ TEST_F(LabelButtonTest, Init) {
   EXPECT_TRUE(button.GetImage(CustomButton::BS_DISABLED).isNull());
 
   EXPECT_EQ(text, button.GetText());
-  EXPECT_EQ(Label::ALIGN_LEFT, button.GetHorizontalAlignment());
+  EXPECT_EQ(gfx::ALIGN_LEFT, button.GetHorizontalAlignment());
   EXPECT_FALSE(button.default_button());
   EXPECT_FALSE(button.native_theme());
   EXPECT_EQ(CustomButton::BS_NORMAL, button.state());
@@ -135,15 +135,15 @@ TEST_F(LabelButtonTest, LabelAndImage) {
   // (A proper parent view or layout manager would Layout on its invalidations).
   button.SetSize(button.GetPreferredSize());
   button.Layout();
-  EXPECT_EQ(Label::ALIGN_LEFT, button.GetHorizontalAlignment());
+  EXPECT_EQ(gfx::ALIGN_LEFT, button.GetHorizontalAlignment());
   EXPECT_LT(button.image_->bounds().right(), button.label_->bounds().x());
-  button.SetHorizontalAlignment(Label::ALIGN_CENTER);
+  button.SetHorizontalAlignment(gfx::ALIGN_CENTER);
   button.Layout();
-  EXPECT_EQ(Label::ALIGN_CENTER, button.GetHorizontalAlignment());
+  EXPECT_EQ(gfx::ALIGN_CENTER, button.GetHorizontalAlignment());
   EXPECT_LT(button.image_->bounds().right(), button.label_->bounds().x());
-  button.SetHorizontalAlignment(Label::ALIGN_RIGHT);
+  button.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
   button.Layout();
-  EXPECT_EQ(Label::ALIGN_RIGHT, button.GetHorizontalAlignment());
+  EXPECT_EQ(gfx::ALIGN_RIGHT, button.GetHorizontalAlignment());
   EXPECT_LT(button.label_->bounds().right(), button.image_->bounds().x());
 
   button.SetText(string16());
diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc
index 4de151b..08394ce 100644
--- a/ui/views/controls/label.cc
+++ b/ui/views/controls/label.cc
@@ -101,15 +101,17 @@ void Label::ClearEmbellishing() {
   has_shadow_ = false;
 }
 
-void Label::SetHorizontalAlignment(Alignment alignment) {
+void Label::SetHorizontalAlignment(gfx::HorizontalAlignment alignment) {
   // If the View's UI layout is right-to-left and directionality_mode_ is
   // USE_UI_DIRECTIONALITY, we need to flip the alignment so that the alignment
   // settings take into account the text directionality.
   if (base::i18n::IsRTL() && (directionality_mode_ == USE_UI_DIRECTIONALITY) &&
-      (alignment != ALIGN_CENTER))
-    alignment = (alignment == ALIGN_LEFT) ? ALIGN_RIGHT : ALIGN_LEFT;
-  if (horiz_alignment_ != alignment) {
-    horiz_alignment_ = alignment;
+      (alignment != gfx::ALIGN_CENTER)) {
+    alignment = (alignment == gfx::ALIGN_LEFT) ?
+        gfx::ALIGN_RIGHT : gfx::ALIGN_LEFT;
+  }
+  if (horizontal_alignment_ != alignment) {
+    horizontal_alignment_ = alignment;
     SchedulePaint();
   }
 }
@@ -321,7 +323,7 @@ void Label::Init(const string16& text, const gfx::Font& font) {
       ui::NativeTheme::kColorId_LabelBackgroundColor);
   auto_color_readability_ = true;
   RecalculateColors();
-  horiz_alignment_ = ALIGN_CENTER;
+  horizontal_alignment_ = gfx::ALIGN_CENTER;
   is_multi_line_ = false;
   allow_character_break_ = false;
   elide_behavior_ = NO_ELIDE;
@@ -354,10 +356,10 @@ gfx::Rect Label::GetTextBounds() const {
 
   gfx::Insets insets = GetInsets();
   gfx::Point text_origin(insets.left(), insets.top());
-  switch (horiz_alignment_) {
-    case ALIGN_LEFT:
+  switch (horizontal_alignment_) {
+    case gfx::ALIGN_LEFT:
       break;
-    case ALIGN_CENTER:
+    case gfx::ALIGN_CENTER:
       // We put any extra margin pixel on the left rather than the right.  We
       // used to do this because measurement on Windows used
       // GetTextExtentPoint32(), which could report a value one too large on the
@@ -365,7 +367,7 @@ gfx::Rect Label::GetTextBounds() const {
       text_origin.Offset((available_rect.width() + 1 - text_size.width()) / 2,
                          0);
       break;
-    case ALIGN_RIGHT:
+    case gfx::ALIGN_RIGHT:
       text_origin.set_x(available_rect.right() - text_size.width());
       break;
     default:
@@ -407,14 +409,14 @@ int Label::ComputeDrawStringFlags() const {
 #endif
   if (allow_character_break_)
     flags |= gfx::Canvas::CHARACTER_BREAK;
-  switch (horiz_alignment_) {
-    case ALIGN_LEFT:
+  switch (horizontal_alignment_) {
+    case gfx::ALIGN_LEFT:
       flags |= gfx::Canvas::TEXT_ALIGN_LEFT;
       break;
-    case ALIGN_CENTER:
+    case gfx::ALIGN_CENTER:
       flags |= gfx::Canvas::TEXT_ALIGN_CENTER;
       break;
-    case ALIGN_RIGHT:
+    case gfx::ALIGN_RIGHT:
       flags |= gfx::Canvas::TEXT_ALIGN_RIGHT;
       break;
   }
diff --git a/ui/views/controls/label.h b/ui/views/controls/label.h
index bd21766..065a8d8 100644
--- a/ui/views/controls/label.h
+++ b/ui/views/controls/label.h
@@ -12,6 +12,7 @@
 #include "base/string16.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/font.h"
+#include "ui/gfx/text_constants.h"
 #include "ui/views/view.h"
 
 namespace views {
@@ -25,10 +26,6 @@ namespace views {
 /////////////////////////////////////////////////////////////////////////////
 class VIEWS_EXPORT Label : public View {
  public:
-  enum Alignment { ALIGN_LEFT = 0,
-                   ALIGN_CENTER,
-                   ALIGN_RIGHT };
-
   // The following enum is used to indicate whether using the Chrome UI's
   // directionality as the label's directionality, or auto-detecting the label's
   // directionality.
@@ -97,9 +94,11 @@ class VIEWS_EXPORT Label : public View {
   // should be reset to AUTO_DETECT_DIRECTIONALITY before the horizontal
   // alignment is set. Otherwise, the label's alignment specified as a parameter
   // will be flipped in RTL locales.
-  void SetHorizontalAlignment(Alignment alignment);
+  void SetHorizontalAlignment(gfx::HorizontalAlignment alignment);
 
-  Alignment horizontal_alignment() const { return horiz_alignment_; }
+  gfx::HorizontalAlignment horizontal_alignment() const {
+    return horizontal_alignment_;
+  }
 
   // Sets the directionality mode. The directionality mode is initialized to
   // USE_UI_DIRECTIONALITY when the label is constructed. USE_UI_DIRECTIONALITY
@@ -227,7 +226,7 @@ class VIEWS_EXPORT Label : public View {
   bool is_multi_line_;
   bool allow_character_break_;
   ElideBehavior elide_behavior_;
-  Alignment horiz_alignment_;
+  gfx::HorizontalAlignment horizontal_alignment_;
   string16 tooltip_text_;
   // Whether to collapse the label when it's not visible.
   bool collapse_when_hidden_;
diff --git a/ui/views/controls/label_unittest.cc b/ui/views/controls/label_unittest.cc
index 12bc7fe..f4bd25a 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);
diff --git a/ui/views/controls/message_box_view.cc b/ui/views/controls/message_box_view.cc
index fcde521..bfea5c9 100644
--- a/ui/views/controls/message_box_view.cc
+++ b/ui/views/controls/message_box_view.cc
@@ -168,9 +168,9 @@ void MessageBoxView::Init(const InitParams& params) {
     // first character with strong directionality.
     base::i18n::TextDirection message_direction =
         base::i18n::GetFirstStrongCharacterDirection(params.message);
-    Label::Alignment alignment =
+    gfx::HorizontalAlignment alignment =
         (message_direction == base::i18n::RIGHT_TO_LEFT) ?
-        Label::ALIGN_RIGHT : Label::ALIGN_LEFT;
+        gfx::ALIGN_RIGHT : gfx::ALIGN_LEFT;
     for (size_t i = 0; i < texts.size(); ++i) {
       Label* message_label = new Label(texts[i]);
       // Don't set multi-line to true if the text is empty, else the label will
@@ -185,7 +185,7 @@ void MessageBoxView::Init(const InitParams& params) {
     Label* message_label = new Label(params.message);
     message_label->SetMultiLine(true);
     message_label->SetAllowCharacterBreak(true);
-    message_label->SetHorizontalAlignment(Label::ALIGN_LEFT);
+    message_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     message_labels_.push_back(message_label);
   }
 
diff --git a/ui/views/examples/button_example.cc b/ui/views/examples/button_example.cc
index 7e4b579..54f5363 100644
--- a/ui/views/examples/button_example.cc
+++ b/ui/views/examples/button_example.cc
@@ -154,8 +154,9 @@ void ButtonExample::LabelButtonPressed(const ui::Event& event) {
           label_button_->GetImage(CustomButton::BS_NORMAL).isNull() ?
           *icon_ : gfx::ImageSkia());
     } else {
-      label_button_->SetHorizontalAlignment(static_cast<Label::Alignment>(
-          (label_button_->GetHorizontalAlignment() + 1) % 3));
+      label_button_->SetHorizontalAlignment(
+          static_cast<gfx::HorizontalAlignment>(
+              (label_button_->GetHorizontalAlignment() + 1) % 3));
     }
   } else if (event.IsShiftDown()) {
     if (event.IsAltDown()) {
diff --git a/ui/views/examples/label_example.cc b/ui/views/examples/label_example.cc
index 0ff667d..471c54f 100644
--- a/ui/views/examples/label_example.cc
+++ b/ui/views/examples/label_example.cc
@@ -51,15 +51,15 @@ void LabelExample::CreateExampleView(View* container) {
   const wchar_t hello_world_hebrew[] =
       L"\x5e9\x5dc\x5d5\x5dd \x5d4\x5e2\x5d5\x5dc\x5dd!";
   label = new Label(WideToUTF16(hello_world_hebrew));
-  label->SetHorizontalAlignment(Label::ALIGN_RIGHT);
+  label->SetHorizontalAlignment(gfx::ALIGN_RIGHT);
   container->AddChildView(label);
 
   label = new Label(WideToUTF16(L"A UTF16 surrogate pair: \x5d0\x5b0"));
-  label->SetHorizontalAlignment(Label::ALIGN_RIGHT);
+  label->SetHorizontalAlignment(gfx::ALIGN_RIGHT);
   container->AddChildView(label);
 
   label = new Label(ASCIIToUTF16("A left-aligned blue label."));
-  label->SetHorizontalAlignment(Label::ALIGN_LEFT);
+  label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   label->SetEnabledColor(SK_ColorBLUE);
   container->AddChildView(label);
 
diff --git a/ui/views/focus/focus_traversal_unittest.cc b/ui/views/focus/focus_traversal_unittest.cc
index 471f7aa8..c110b21 100644
--- a/ui/views/focus/focus_traversal_unittest.cc
+++ b/ui/views/focus/focus_traversal_unittest.cc
@@ -456,7 +456,7 @@ void FocusTraversalTest::InitContentView() {
   y = 5;
   for (size_t i = 0; i < arraysize(kTitles); ++i) {
     Link* link = new Link(ASCIIToUTF16(kTitles[i]));
-    link->SetHorizontalAlignment(Label::ALIGN_LEFT);
+    link->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     link->set_id(kIDs[i]);
     scroll_content->AddChildView(link);
     link->SetBounds(5, y, 300, 15);
@@ -538,7 +538,7 @@ void FocusTraversalTest::InitContentView() {
   button->set_id(kSearchButtonID);
 
   link = new Link(ASCIIToUTF16("Help"));
-  link->SetHorizontalAlignment(Label::ALIGN_LEFT);
+  link->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   link->set_id(kHelpLinkID);
   contents->AddChildView(link);
   link->SetBounds(175, 10, 30, 20);