(Merge to M-51) Revise the shelf alignment locking mechanism.

ash/system/tray/tray_utils.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/tray_utils.h"
 
+#include "ash/shelf/shelf_util.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_item_view.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 
 namespace ash {
 
 void SetupLabelForTray(views::Label* label) {
   label->SetFontList(gfx::FontList().Derive(1, gfx::Font::BOLD));
   label->SetAutoColorReadabilityEnabled(false);
   label->SetEnabledColor(SK_ColorWHITE);
   label->SetBackgroundColor(SkColorSetARGB(0, 255, 255, 255));
   label->SetShadows(gfx::ShadowValues(
       1,
       gfx::ShadowValue(gfx::Vector2d(0, 1), 0, SkColorSetARGB(64, 0, 0, 0))));
 }
 
 void SetTrayImageItemBorder(views::View* tray_view,
                             ShelfAlignment alignment) {
-  if (alignment == SHELF_ALIGNMENT_BOTTOM) {
+  if (IsHorizontalAlignment(alignment)) {
     tray_view->SetBorder(views::Border::CreateEmptyBorder(
-        0,
-        kTrayImageItemHorizontalPaddingBottomAlignment,
-        0,
+        0, kTrayImageItemHorizontalPaddingBottomAlignment, 0,
         kTrayImageItemHorizontalPaddingBottomAlignment));
   } else {
     tray_view->SetBorder(views::Border::CreateEmptyBorder(
         kTrayImageItemVerticalPaddingVerticalAlignment,
         kTrayImageItemHorizontalPaddingVerticalAlignment,
         kTrayImageItemVerticalPaddingVerticalAlignment,
         kTrayImageItemHorizontalPaddingVerticalAlignment));
   }
 }
 
 void SetTrayLabelItemBorder(TrayItemView* tray_view,
                             ShelfAlignment alignment) {
-  if (alignment == SHELF_ALIGNMENT_BOTTOM) {
+  if (IsHorizontalAlignment(alignment)) {
     tray_view->SetBorder(views::Border::CreateEmptyBorder(
-        0,
-        kTrayLabelItemHorizontalPaddingBottomAlignment,
-        0,
+        0, kTrayLabelItemHorizontalPaddingBottomAlignment, 0,
         kTrayLabelItemHorizontalPaddingBottomAlignment));
   } else {
     // Center the label for vertical launcher alignment.
     int horizontal_padding = std::max(0,
         (tray_view->GetPreferredSize().width() -
         tray_view->label()->GetPreferredSize().width()) / 2);
     tray_view->SetBorder(views::Border::CreateEmptyBorder(
-        kTrayLabelItemVerticalPaddingVerticalAlignment,
-        horizontal_padding,
-        kTrayLabelItemVerticalPaddingVerticalAlignment,
-        horizontal_padding));
+        kTrayLabelItemVerticalPaddingVerticalAlignment, horizontal_padding,
+        kTrayLabelItemVerticalPaddingVerticalAlignment, horizontal_padding));
   }
 }
 
 void GetAccessibleLabelFromDescendantViews(
     views::View* view,
     std::vector<base::string16>& out_labels) {
   ui::AXViewState temp_state;
   view->GetAccessibleState(&temp_state);
   if (!temp_state.name.empty())
     out_labels.push_back(temp_state.name);
 
   // Do not descend into static text labels which may compute their own labels
   // recursively.
   if (temp_state.role == ui::AX_ROLE_STATIC_TEXT)
     return;
 
   for (int i = 0; i < view->child_count(); ++i)
     GetAccessibleLabelFromDescendantViews(view->child_at(i), out_labels);
 }
 
 }  // namespace ash