Replace Label::Alignment with gfx::HorizontalAlignment

ui/views/controls/button/label_button.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/button/label_button.h"
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 26 matching lines @@
   set_border(new LabelButtonBorder());
   // Inset the button focus rect from the actual border; roughly match Windows.
   set_focus_border(FocusBorder::CreateDashedFocusBorder(3, 3, 3, 3));
   SetAnimationDuration(kHoverAnimationDurationMs);
 
   AddChildView(image_);
   image_->set_interactive(false);
 
   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);
 }
 
 LabelButton::~LabelButton() {}
 
 const gfx::ImageSkia& LabelButton::GetImage(ButtonState for_state) {
   if (for_state != BS_NORMAL && button_state_images_[for_state].isNull())
     return button_state_images_[BS_NORMAL];
@@ skipping 30 matching lines @@
 }
 
 const gfx::Font& LabelButton::GetFont() const {
   return label_->font();
 }
 
 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();
 }
 
 void LabelButton::SetDefaultButton(bool default_button) {
   if (default_button == default_button_)
     return;
   default_button_ = default_button;
   ui::Accelerator accel(ui::VKEY_RETURN, ui::EF_NONE);
   default_button_ ? AddAccelerator(accel) : RemoveAccelerator(accel);
@@ skipping 63 matching lines @@
   gfx::Size image_size(image_->GetPreferredSize());
   image_size.set_width(std::min(image_size.width(), child_area.width()));
   image_size.set_height(std::min(image_size.height(), child_area.height()));
 
   // The label takes any remaining width after sizing the image, unless both
   // views are centered. In that case, using the tighter preferred label width
   // avoids wasted space within the label that would look like awkward padding.
   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()));
     }
   }
 
   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));
   label_->SetBoundsRect(gfx::Rect(label_origin, label_size));
 }
 
 std::string LabelButton::GetClassName() const {
   return "views/LabelButton";
 }
 
@@ skipping 47 matching lines @@
   params->button.indeterminate = false;
   params->button.is_default = default_button();
   params->button.is_focused = HasFocus() && IsAccessibilityFocusable();
   params->button.has_border = native_theme();
   params->button.classic_state = 0;
   params->button.background_color = ui::NativeTheme::instance()->GetSystemColor(
       ui::NativeTheme::kColorId_TextButtonBackgroundColor);
 }
 
 }  // namespace views