Replace Label::Alignment with gfx::HorizontalAlignment

ash/system/tray_caps_lock.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 "ash/system/tray_caps_lock.h"
 
 #include "ash/caps_lock_delegate.h"
 #include "ash/shell.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_views.h"
@@ skipping 20 matching lines @@
                                           0,
                                           kTrayPopupPaddingBetweenItems));
 
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     FixedSizedImageView* image =
         new FixedSizedImageView(0, kTrayPopupItemHeight);
     image->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK).
         ToImageSkia());
     AddChildView(image);
 
-    text_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+    text_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     AddChildView(text_label_);
 
     shortcut_label_->SetEnabled(false);
     AddChildView(shortcut_label_);
   }
 
   virtual ~CapsLockDefaultView() {}
 
   // Updates the label text and the shortcut text.
   void Update(bool caps_lock_enabled, bool search_mapped_to_caps_lock) {
@@ skipping 88 matching lines @@
   image->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK).
       ToImageSkia());
 
   detailed_->AddChildView(image);
 
   const int string_id = search_mapped_to_caps_lock_ ?
       IDS_ASH_STATUS_TRAY_CAPS_LOCK_CANCEL_BY_SEARCH :
       IDS_ASH_STATUS_TRAY_CAPS_LOCK_CANCEL_BY_ALT_SEARCH;
   views::Label* label = new views::Label(bundle.GetLocalizedString(string_id));
   label->SetMultiLine(true);
-  label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+  label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   detailed_->AddChildView(label);
 
   return detailed_;
 }
 
 void TrayCapsLock::DestroyDefaultView() {
   default_ = NULL;
 }
 
 void TrayCapsLock::DestroyDetailedView() {
@@ skipping 17 matching lines @@
         message_shown_ = true;
       }
     } else if (detailed_) {
       detailed_->GetWidget()->Close();
     }
   }
 }
 
 }  // namespace internal
 }  // namespace ash