Shelf Cleanup AlternateShelfLayout P1 Attempt 3

ash/shelf/overflow_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/overflow_button.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "grit/ash_resources.h"
@@ skipping 70 matching lines @@
   path.addRoundRect(gfx::RectToSkRect(rect), radius, radius);
   canvas->DrawPath(path, paint);
 }
 
 void OverflowButton::OnPaint(gfx::Canvas* canvas) {
   ShelfLayoutManager* layout_manager =
       ShelfLayoutManager::ForShelf(GetWidget()->GetNativeView());
   ShelfAlignment alignment = layout_manager->GetAlignment();
 
   gfx::Rect bounds(GetContentsBounds());
-  if (ash::switches::UseAlternateShelfLayout()) {
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    int background_image_id = 0;
-    if (layout_manager->shelf_widget()->shelf()->IsShowingOverflowBubble())
-      background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_PRESSED;
-    else if(layout_manager->shelf_widget()->GetDimsShelf())
-      background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_ON_BLACK;
-    else
-      background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_NORMAL;
+  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  int background_image_id = 0;
+  if (layout_manager->shelf_widget()->shelf()->IsShowingOverflowBubble())
+    background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_PRESSED;
+  else if(layout_manager->shelf_widget()->GetDimsShelf())
+    background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_ON_BLACK;
+  else
+    background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_NORMAL;
 
-    const gfx::ImageSkia* background =
-        rb.GetImageNamed(background_image_id).ToImageSkia();
-    if (alignment == SHELF_ALIGNMENT_LEFT) {
-      bounds = gfx::Rect(
-          bounds.right() - background->width() -
-              ShelfLayoutManager::kShelfItemInset,
-          bounds.y() + (bounds.height() - background->height()) / 2,
-          background->width(), background->height());
-    } else if (alignment == SHELF_ALIGNMENT_RIGHT) {
-      bounds = gfx::Rect(
-          bounds.x() + ShelfLayoutManager::kShelfItemInset,
-          bounds.y() + (bounds.height() - background->height()) / 2,
-          background->width(), background->height());
-    } else {
-      bounds = gfx::Rect(
-          bounds.x() + (bounds.width() - background->width()) / 2,
-          bounds.y() + ShelfLayoutManager::kShelfItemInset,
-          background->width(), background->height());
-    }
-    canvas->DrawImageInt(*background, bounds.x(), bounds.y());
+  const gfx::ImageSkia* background =
+      rb.GetImageNamed(background_image_id).ToImageSkia();
+  if (alignment == SHELF_ALIGNMENT_LEFT) {
+    bounds = gfx::Rect(
+        bounds.right() - background->width() -
+            ShelfLayoutManager::kShelfItemInset,
+        bounds.y() + (bounds.height() - background->height()) / 2,
+        background->width(), background->height());
+  } else if (alignment == SHELF_ALIGNMENT_RIGHT) {
+    bounds = gfx::Rect(
+        bounds.x() + ShelfLayoutManager::kShelfItemInset,
+        bounds.y() + (bounds.height() - background->height()) / 2,
+        background->width(), background->height());
   } else {
-    if (alignment == SHELF_ALIGNMENT_BOTTOM) {
-      bounds = gfx::Rect(
-          bounds.x() + ((bounds.width() - kButtonHoverSize) / 2) - 1,
-          bounds.y() + kBackgroundOffset - 1,
-          kButtonHoverSize, kButtonHoverSize);
-    } else {
-      bounds = gfx::Rect(
-          bounds.x() + kBackgroundOffset -1,
-          bounds.y() + ((bounds.height() - kButtonHoverSize) / 2) -1,
-          kButtonHoverSize, kButtonHoverSize);
-    }
-    if (hover_animation_->is_animating()) {
-      PaintBackground(
-          canvas,
-          kButtonHoverAlpha * hover_animation_->GetCurrentValue());
-    } else if (state() == STATE_HOVERED || state() == STATE_PRESSED) {
-      PaintBackground(canvas, kButtonHoverAlpha);
-    }
+    bounds = gfx::Rect(
+        bounds.x() + (bounds.width() - background->width()) / 2,
+        bounds.y() + ShelfLayoutManager::kShelfItemInset,
+        background->width(), background->height());
   }
+  canvas->DrawImageInt(*background, bounds.x(), bounds.y());
 
   if (height() < kButtonHoverSize)
     return;
 
   const gfx::ImageSkia* image = NULL;
 
   switch(alignment) {
     case SHELF_ALIGNMENT_LEFT:
       if (left_image_.isNull()) {
         left_image_ = gfx::ImageSkiaOperations::CreateRotatedImage(
@@ skipping 12 matching lines @@
       image = bottom_image_;
       break;
   }
 
   canvas->DrawImageInt(*image,
                        bounds.x() + ((bounds.width() - image->width()) / 2),
                        bounds.y() + ((bounds.height() - image->height()) / 2));
 }
 
 }  // namespace ash