| Index: athena/home/home_card_impl.cc
|
| diff --git a/athena/home/home_card_impl.cc b/athena/home/home_card_impl.cc
|
| index 0066cf3d3be8e000d6fe2972df30c5e20fa8b190..1dfadf0ba02c74fb7b4da4e911b003dfabb4fcd7 100644
|
| --- a/athena/home/home_card_impl.cc
|
| +++ b/athena/home/home_card_impl.cc
|
| @@ -165,24 +165,11 @@ class HomeCardView : public views::WidgetDelegateView {
|
| main_view_->SetLayoutState(1.0f - progress);
|
| else if (to_state == HomeCard::VISIBLE_CENTERED)
|
| main_view_->SetLayoutState(progress);
|
| - else
|
| - SetState(to_state);
|
| - }
|
| -
|
| - void SetState(HomeCard::State state) {
|
| - if (state == HomeCard::VISIBLE_CENTERED)
|
| - main_view_->RequestFocusOnSearchBox();
|
| - else
|
| - GetWidget()->GetFocusManager()->ClearFocus();
|
| - wm::SetShadowType(GetWidget()->GetNativeView(),
|
| - state == HomeCard::VISIBLE_MINIMIZED ?
|
| - wm::SHADOW_TYPE_NONE :
|
| - wm::SHADOW_TYPE_RECTANGULAR);
|
| - main_view_->SetLayoutState(
|
| - (state == HomeCard::VISIBLE_CENTERED) ? 1.0f : 0.0f);
|
| + UpdateShadow(true);
|
| }
|
|
|
| void SetStateWithAnimation(HomeCard::State state) {
|
| + UpdateShadow(state != HomeCard::VISIBLE_MINIMIZED);
|
| if (state == HomeCard::VISIBLE_CENTERED)
|
| main_view_->RequestFocusOnSearchBox();
|
| else
|
| @@ -221,6 +208,12 @@ class HomeCardView : public views::WidgetDelegateView {
|
| }
|
|
|
| private:
|
| + void UpdateShadow(bool should_show) {
|
| + wm::SetShadowType(
|
| + GetWidget()->GetNativeWindow(),
|
| + should_show ? wm::SHADOW_TYPE_RECTANGULAR : wm::SHADOW_TYPE_NONE);
|
| + }
|
| +
|
| // views::WidgetDelegate:
|
| virtual views::View* GetContentsView() OVERRIDE {
|
| return this;
|
|
|