Shelf Cleanup AlternateShelfLayout P1 Attempt 3

ash/shelf/shelf_button.cc

Index: ash/shelf/shelf_button.cc
diff --git a/ash/shelf/shelf_button.cc b/ash/shelf/shelf_button.cc
index 2aa6360685ae55864c4ff01cb44151f742bc8b6b..fb255d7fd893814150850f8090c2dafe248a56e1 100644
--- a/ash/shelf/shelf_button.cc
+++ b/ash/shelf/shelf_button.cc
@@ -31,20 +31,10 @@ namespace {
 // if the shelf is aligned horizontally then this is the height of the bar.
 const int kBarSize = 3;
 const int kIconSize = 32;
-const int kHopSpacing = 2;
-const int kIconPad = 8;
-const int kAlternateIconPad = 5;
-const int kAlternateIconPadVertical = 6;
-const int kHopUpMS = 0;
-const int kHopDownMS = 200;
+const int kIconPad = 5;
+const int kIconPadVertical = 6;
 const int kAttentionThrobDurationMS = 800;
 
-bool ShouldHop(int state) {
-  return state & ash::ShelfButton::STATE_HOVERED ||
-         state & ash::ShelfButton::STATE_ACTIVE ||
-         state & ash::ShelfButton::STATE_FOCUSED;
-}
-
 // Simple AnimationDelegate that owns a single ThrobAnimation instance to
 // keep all Draw Attention animations in sync.
 class ShelfButtonAnimation : public gfx::AnimationDelegate {
@@ -297,13 +287,6 @@ const gfx::ImageSkia& ShelfButton::GetImage() const {
 
 void ShelfButton::AddState(State state) {
   if (!(state_ & state)) {
-    if (!ash::switches::UseAlternateShelfLayout() &&
-        (ShouldHop(state) || !ShouldHop(state_))) {
-      ui::ScopedLayerAnimationSettings scoped_setter(
-          icon_view_->layer()->GetAnimator());
-      scoped_setter.SetTransitionDuration(
-          base::TimeDelta::FromMilliseconds(kHopUpMS));
-    }
     state_ |= state;
     Layout();
     if (state & STATE_ATTENTION)
@@ -313,14 +296,6 @@ void ShelfButton::AddState(State state) {
 
 void ShelfButton::ClearState(State state) {
   if (state_ & state) {
-    if (!ash::switches::UseAlternateShelfLayout() &&
-        (!ShouldHop(state) || ShouldHop(state_))) {
-      ui::ScopedLayerAnimationSettings scoped_setter(
-          icon_view_->layer()->GetAnimator());
-      scoped_setter.SetTweenType(gfx::Tween::LINEAR);
-      scoped_setter.SetTransitionDuration(
-          base::TimeDelta::FromMilliseconds(kHopDownMS));
-    }
     state_ &= ~state;
     Layout();
     if (state & STATE_ATTENTION)
@@ -398,12 +373,9 @@ void ShelfButton::GetAccessibleState(ui::AXViewState* state) {
 
 void ShelfButton::Layout() {
   const gfx::Rect button_bounds(GetContentsBounds());
-  int icon_pad = kIconPad;
-  if (ash::switches::UseAlternateShelfLayout()) {
-      icon_pad =
-          shelf_layout_manager_->GetAlignment() != SHELF_ALIGNMENT_BOTTOM ?
-          kAlternateIconPadVertical : kAlternateIconPad;
-  }
+  int icon_pad =
+      shelf_layout_manager_->GetAlignment() != SHELF_ALIGNMENT_BOTTOM ?
+      kIconPadVertical : kIconPad;
   int x_offset = shelf_layout_manager_->PrimaryAxisValue(0, icon_pad);
   int y_offset = shelf_layout_manager_->PrimaryAxisValue(icon_pad, 0);
 
@@ -420,13 +392,6 @@ void ShelfButton::Layout() {
   if (SHELF_ALIGNMENT_TOP == shelf_layout_manager_->GetAlignment())
     y_offset = button_bounds.height() - (kIconSize + icon_pad);
 
-  if (ShouldHop(state_) && !ash::switches::UseAlternateShelfLayout()) {
-    x_offset += shelf_layout_manager_->SelectValueForShelfAlignment(
-        0, kHopSpacing, -kHopSpacing, 0);
-    y_offset += shelf_layout_manager_->SelectValueForShelfAlignment(
-        -kHopSpacing, 0, 0, kHopSpacing);
-  }
-
   // Center icon with respect to the secondary axis, and ensure
   // that the icon doesn't occlude the bar highlight.
   if (shelf_layout_manager_->IsHorizontalAlignment()) {
@@ -544,19 +509,10 @@ void ShelfButton::UpdateBar() {
   }
 
   int bar_id = 0;
-  if (ash::switches::UseAlternateShelfLayout()) {
-    if (state_ & STATE_ACTIVE)
-      bar_id = IDR_ASH_SHELF_UNDERLINE_ACTIVE_ALTERNATE;
-    else if (state_ & STATE_RUNNING)
-      bar_id = IDR_ASH_SHELF_UNDERLINE_RUNNING_ALTERNATE;
-  } else {
-    if (state_ & (STATE_ACTIVE | STATE_ATTENTION))
-      bar_id = IDR_ASH_SHELF_UNDERLINE_ACTIVE;
-    else if (state_ & (STATE_HOVERED | STATE_FOCUSED))
-      bar_id = IDR_ASH_SHELF_UNDERLINE_HOVER;
-    else
-      bar_id = IDR_ASH_SHELF_UNDERLINE_RUNNING;
-  }
+  if (state_ & STATE_ACTIVE)
+    bar_id = IDR_ASH_SHELF_UNDERLINE_ACTIVE;
+  else if (state_ & STATE_RUNNING)
+    bar_id = IDR_ASH_SHELF_UNDERLINE_RUNNING;
 
   if (bar_id != 0) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();