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

ash/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/shelf/shelf_button.h"
 
 #include <algorithm>
 
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
@@ skipping 162 matching lines @@
   void UpdateBounds() {
     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 (shelf_->alignment() == SHELF_ALIGNMENT_BOTTOM) {
+      if (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 284 matching lines @@
 
   int bar_id = 0;
   if (state_ & (STATE_ACTIVE))
     bar_id = IDR_ASH_SHELF_UNDERLINE_ACTIVE;
   else if (state_ & STATE_ATTENTION)
     bar_id = IDR_ASH_SHELF_UNDERLINE_ATTENTION;
   else if (state_ & STATE_RUNNING)
     bar_id = IDR_ASH_SHELF_UNDERLINE_RUNNING;
 
   if (bar_id != 0) {
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    const gfx::ImageSkia* image = rb.GetImageNamed(bar_id).ToImageSkia();
-
     Shelf* shelf = shelf_view_->shelf();
-    if (shelf->alignment() == SHELF_ALIGNMENT_BOTTOM) {
-      bar_->SetImage(*image);
-    } else {
-      bar_->SetImage(gfx::ImageSkiaOperations::CreateRotatedImage(
-          *image, shelf->SelectValueForShelfAlignment(
-                      SkBitmapOperations::ROTATION_90_CW,
-                      SkBitmapOperations::ROTATION_90_CW,
-                      SkBitmapOperations::ROTATION_270_CW)));
+    ResourceBundle* rb = &ResourceBundle::GetSharedInstance();
+    gfx::ImageSkia image = *rb->GetImageNamed(bar_id).ToImageSkia();
+    if (!shelf->IsHorizontalAlignment()) {
+      image = gfx::ImageSkiaOperations::CreateRotatedImage(
+          image, shelf->alignment() == SHELF_ALIGNMENT_LEFT
+                     ? SkBitmapOperations::ROTATION_90_CW
+                     : SkBitmapOperations::ROTATION_270_CW);
     }
+    bar_->SetImage(image);
     bar_->SetHorizontalAlignment(shelf->SelectValueForShelfAlignment(
         views::ImageView::CENTER, views::ImageView::LEADING,
         views::ImageView::TRAILING));
     bar_->SetVerticalAlignment(shelf->SelectValueForShelfAlignment(
         views::ImageView::TRAILING, views::ImageView::CENTER,
         views::ImageView::CENTER));
     bar_->SchedulePaint();
   }
 
   bar_->SetVisible(bar_id != 0 && state_ != STATE_NORMAL);
 }
 
 }  // namespace ash