Merge 198585 "Regression issue with "ShouldHop", the UpdateState..."

ash/launcher/launcher_button.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/launcher/launcher_button.h"
 
 #include <algorithm>
 
 #include "ash/launcher/launcher_button_host.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ skipping 282 matching lines @@
 
 void LauncherButton::AddState(State state) {
   if (!(state_ & state)) {
     if (ShouldHop(state) || !ShouldHop(state_)) {
       ui::ScopedLayerAnimationSettings scoped_setter(
           icon_view_->layer()->GetAnimator());
       scoped_setter.SetTransitionDuration(
           base::TimeDelta::FromMilliseconds(kHopUpMS));
     }
     state_ |= state;
-    UpdateState();
+    Layout();
     if (state & STATE_ATTENTION)
       bar_->ShowAttention(true);
   }
 }
 
 void LauncherButton::ClearState(State state) {
   if (state_ & state) {
     if (!ShouldHop(state) || ShouldHop(state_)) {
       ui::ScopedLayerAnimationSettings scoped_setter(
           icon_view_->layer()->GetAnimator());
       scoped_setter.SetTweenType(ui::Tween::LINEAR);
       scoped_setter.SetTransitionDuration(
           base::TimeDelta::FromMilliseconds(kHopDownMS));
     }
     state_ &= ~state;
-    UpdateState();
+    Layout();
     if (state & STATE_ATTENTION)
       bar_->ShowAttention(false);
   }
 }
 
 gfx::Rect LauncherButton::GetIconBounds() const {
   return icon_view_->bounds();
 }
 
 void LauncherButton::ShowContextMenu(const gfx::Point& p,
@@ skipping 190 matching lines @@
           views::ImageView::TRAILING,
           views::ImageView::CENTER,
           views::ImageView::CENTER,
           views::ImageView::LEADING));
   bar_->SchedulePaint();
   SchedulePaint();
 }
 
 }  // namespace internal
 }  // namespace ash