Replace Label::Alignment with gfx::HorizontalAlignment

chrome/browser/chromeos/input_method/candidate_window.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 "chrome/browser/chromeos/input_method/candidate_window.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 213 matching lines @@
   // child view, hence it's deleted when |this| is deleted.
   if (orientation == InputMethodLookupTable::kVertical) {
     candidate_label = new VerticalCandidateLabel;
   } else {
     candidate_label = new views::Label;
   }
 
   // Change the font size.
   candidate_label->SetFont(
       candidate_label->font().DeriveFont(kFontSizeDelta));
-  candidate_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+  candidate_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 
   return candidate_label;
 }
 
 // Creates the annotation label, and return it (never returns NULL).
 // The label text is not set in this function.
 views::Label* CreateAnnotationLabel(
     InputMethodLookupTable::Orientation orientation) {
   // Create the annotation label.
   views::Label* annotation_label = new views::Label;
 
   // Change the font size and color.
   annotation_label->SetFont(
       annotation_label->font().DeriveFont(kFontSizeDelta));
   annotation_label->SetEnabledColor(kAnnotationColor);
-  annotation_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+  annotation_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 
   return annotation_label;
 }
 
 // Computes shortcut column size.
 gfx::Size ComputeShortcutColumnSize(
     const InputMethodLookupTable& lookup_table) {
   int shortcut_column_width = 0;
   int shortcut_column_height = 0;
   // Create the shortcut label. The label will be owned by
@@ skipping 148 matching lines @@
   scoped_ptr<views::View> contents_;
   scoped_ptr<views::View> place_holder_;
 
   DISALLOW_COPY_AND_ASSIGN(HidableArea);
 };
 
 // InformationTextArea is a HidableArea having a single Label in it.
 class InformationTextArea : public HidableArea {
  public:
   // Specify the alignment and initialize the control.
-  InformationTextArea(views::Label::Alignment align, int minWidth)
+  InformationTextArea(gfx::HorizontalAlignment align, int minWidth)
       : minWidth_(minWidth) {
     label_ = new views::Label;
     label_->SetHorizontalAlignment(align);
 
     const gfx::Insets kInsets(2, 2, 2, 4);
     views::View* contents = WrapWithPadding(label_, kInsets);
     SetContents(contents);
     contents->set_border(
         views::Border::CreateSolidBorder(1, kFrameColor));
     contents->set_background(
@@ skipping 363 matching lines @@
 CandidateWindowView::~CandidateWindowView() {
 }
 
 void CandidateWindowView::Init() {
   // Set the background and the border of the view.
   set_background(
       views::Background::CreateSolidBackground(kDefaultBackgroundColor));
   set_border(views::Border::CreateSolidBorder(1, kFrameColor));
 
   // Create areas.
-  preedit_area_ = new InformationTextArea(views::Label::ALIGN_LEFT,
+  preedit_area_ = new InformationTextArea(gfx::ALIGN_LEFT,
                                           kMinPreeditAreaWidth);
-  header_area_ = new InformationTextArea(views::Label::ALIGN_LEFT, 0);
+  header_area_ = new InformationTextArea(gfx::ALIGN_LEFT, 0);
   candidate_area_ = new HidableArea;
   candidate_area_->SetContents(new views::View);
-  footer_area_ = new InformationTextArea(views::Label::ALIGN_RIGHT, 0);
+  footer_area_ = new InformationTextArea(gfx::ALIGN_RIGHT, 0);
 
   // Set the window layout of the view
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);  // |this| owns |layout|.
   views::ColumnSet* column_set = layout->AddColumnSet(0);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
                         0, views::GridLayout::USE_PREF, 0, 0);
 
   // Add the preedit area
   layout->StartRow(0, 0);
@@ skipping 467 matching lines @@
     : parent_infolist_window_(parent_infolist_window),
       title_label_(NULL),
       description_label_(NULL),
       selected_(false) {
 }
 
 void InfolistView::Init() {
   title_label_ = new views::Label;
   title_label_->SetPosition(gfx::Point(0, 0));
   title_label_->SetFont(parent_infolist_window_->GetTitleFont());
-  title_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+  title_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   title_label_->set_border(
       views::Border::CreateEmptyBorder(4, 7, 2, 4));
 
   description_label_ = new views::Label;
   description_label_->SetPosition(gfx::Point(0, 0));
   description_label_->SetFont(parent_infolist_window_->GetDescriptionFont());
-  description_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+  description_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   description_label_->SetMultiLine(true);
   description_label_->set_border(
       views::Border::CreateEmptyBorder(2, 17, 4, 4));
   AddChildView(title_label_);
   AddChildView(description_label_);
   UpdateLabelBackgroundColors();
 }
 
 void InfolistView::SetTitleAndDescriptionText(const string16& title,
                                               const string16& description) {
@@ skipping 73 matching lines @@
       views::Background::CreateSolidBackground(kDefaultBackgroundColor));
   set_border(views::Border::CreateSolidBorder(1, kFrameColor));
   infolist_area_ = new views::View;
 
   views::BoxLayout* layout = new views::BoxLayout(views::BoxLayout::kVertical,
                                                   0, 0, 0);
   SetLayoutManager(layout);  // |this| owns |layout|.
 
   views::Label* caption_label = new views::Label;
   caption_label->SetFont(caption_label->font().DeriveFont(kFontSizeDelta - 2));
-  caption_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+  caption_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   caption_label->SetText(
       l10n_util::GetStringUTF16(IDS_INPUT_METHOD_INFOLIST_WINDOW_TITLE));
   caption_label->set_border(
       views::Border::CreateEmptyBorder(2, 2, 2, 2));
   caption_label->set_background(
       views::Background::CreateSolidBackground(kInfolistTitleBackgroundColor));
   caption_label->SetBackgroundColor(
       caption_label->background()->get_color());
 
   AddChildView(caption_label);
@@ skipping 362 matching lines @@
 }
 
 // static
 CandidateWindowController*
 CandidateWindowController::CreateCandidateWindowController() {
   return new CandidateWindowControllerImpl;
 }
 
 }  // namespace input_method
 }  // namespace chromeos