ash: Clean up shelf GetAlignment() and IsHorizontalAlignment() calls

ash/common/shelf/shelf_button.cc

 // Copyright 2013 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/common/shelf/shelf_button.h"
 
 #include <algorithm>
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/ink_drop_button_listener.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/shelf_view.h"
 #include "ash/common/shelf/wm_shelf.h"
-#include "ash/common/shelf/wm_shelf_util.h"
 #include "base/memory/ptr_util.h"
 #include "base/time/time.h"
 #include "grit/ash_resources.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/events/event_constants.h"
@@ skipping 176 matching lines @@
     gfx::Rect bounds = base_bounds_;
     if (show_attention_) {
       // Scale from .35 to 1.0 of the total width (which is wider than the
       // visible width of the image), so the animation "rests" briefly at full
       // visible width.  Cap bounds length at kIconSize to prevent visual
       // flutter while centering bar within further expanding bounds.
       double animation =
           animating_ ? ShelfButtonAnimation::GetInstance()->GetAnimation()
                      : 1.0;
       double scale = .35 + .65 * animation;
-      if (IsHorizontalAlignment(wm_shelf_->GetAlignment())) {
+      if (wm_shelf_->IsHorizontalAlignment()) {
         int width = base_bounds_.width() * scale;
         bounds.set_width(std::min(width, kIconSize));
         int x_offset = (base_bounds_.width() - bounds.width()) / 2;
         bounds.set_x(base_bounds_.x() + x_offset);
         UpdateAnimating(bounds.width() == kIconSize);
       } else {
         int height = base_bounds_.height() * scale;
         bounds.set_height(std::min(height, kIconSize));
         int y_offset = (base_bounds_.height() - bounds.height()) / 2;
         bounds.set_y(base_bounds_.y() + y_offset);
@@ skipping 174 matching lines @@
 }
 
 void ShelfButton::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   node_data->role = ui::AX_ROLE_BUTTON;
   node_data->SetName(shelf_view_->GetTitleForView(this));
 }
 
 void ShelfButton::Layout() {
   const gfx::Rect button_bounds(GetContentsBounds());
   WmShelf* wm_shelf = shelf_view_->wm_shelf();
-  const bool is_horizontal_shelf =
-      IsHorizontalAlignment(wm_shelf->GetAlignment());
+  const bool is_horizontal_shelf = wm_shelf->IsHorizontalAlignment();
   const int icon_pad = ash::MaterialDesignController::IsShelfMaterial()
                            ? (is_horizontal_shelf ? kIconPaddingHorizontalMD
                                                   : kIconPaddingVerticalMD)
                            : (is_horizontal_shelf ? kIconPaddingHorizontal
                                                   : kIconPaddingVertical);
   int x_offset = is_horizontal_shelf ? 0 : icon_pad;
   int y_offset = is_horizontal_shelf ? icon_pad : 0;
 
   int icon_width = std::min(kIconSize, button_bounds.width() - x_offset);
   int icon_height = std::min(kIconSize, button_bounds.height() - y_offset);
@@ skipping 111 matching lines @@
 
 void ShelfButton::NotifyClick(const ui::Event& event) {
   CustomButton::NotifyClick(event);
   if (listener_)
     listener_->ButtonPressed(this, event, GetInkDrop());
 }
 
 void ShelfButton::UpdateState() {
   UpdateBar();
   const bool is_horizontal_shelf =
-      IsHorizontalAlignment(shelf_view_->wm_shelf()->GetAlignment());
+      shelf_view_->wm_shelf()->IsHorizontalAlignment();
   icon_view_->SetHorizontalAlignment(is_horizontal_shelf
                                          ? views::ImageView::CENTER
                                          : views::ImageView::LEADING);
   icon_view_->SetVerticalAlignment(is_horizontal_shelf
                                        ? views::ImageView::LEADING
                                        : views::ImageView::CENTER);
   SchedulePaint();
 }
 
 void ShelfButton::UpdateBar() {
@@ skipping 19 matching lines @@
                        GetShelfConstant(SHELF_SIZE));
         gfx::Canvas canvas(size, kIndicatorCanvasScale, true /* is_opaque */);
         PaintIndicatorOnCanvas(&canvas, size);
         image = gfx::ImageSkia(canvas.ExtractImageRep());
       }
     } else {
       ResourceBundle* rb = &ResourceBundle::GetSharedInstance();
       image = *rb->GetImageNamed(bar_id).ToImageSkia();
     }
     ShelfAlignment shelf_alignment = wm_shelf->GetAlignment();
-    if (!IsHorizontalAlignment(shelf_alignment)) {
+    if (!wm_shelf->IsHorizontalAlignment()) {
       image = gfx::ImageSkiaOperations::CreateRotatedImage(
           image, shelf_alignment == SHELF_ALIGNMENT_LEFT
                      ? SkBitmapOperations::ROTATION_90_CW
                      : SkBitmapOperations::ROTATION_270_CW);
     }
     bar_->SetImage(image);
     switch (shelf_alignment) {
       case SHELF_ALIGNMENT_BOTTOM:
       case SHELF_ALIGNMENT_BOTTOM_LOCKED:
         bar_->SetHorizontalAlignment(views::ImageView::CENTER);
         bar_->SetVerticalAlignment(views::ImageView::TRAILING);
         break;
       case SHELF_ALIGNMENT_LEFT:
         bar_->SetHorizontalAlignment(views::ImageView::LEADING);
         bar_->SetVerticalAlignment(views::ImageView::CENTER);
         break;
       case SHELF_ALIGNMENT_RIGHT:
         bar_->SetHorizontalAlignment(views::ImageView::TRAILING);
         bar_->SetVerticalAlignment(views::ImageView::CENTER);
         break;
     }
     bar_->SchedulePaint();
   }
   bar_->SetVisible(bar_id != 0 && state_ != STATE_NORMAL);
 }
 
 }  // namespace ash