Cleanup home card shadow code.

- Always shown during the gesture
- not showning in minimized state
- HomeCardView::SetState is no longer used. Remove it.

BUG=408825
R=oshima@chromium.org
TEST=athena_unittests

Review URL: https://codereview.chromium.org/521493002

Cr-Commit-Position: refs/heads/master@{#292732}

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;

athena/home/home_card_unittest.cc

@@ -17,6 +17,7 @@
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/widget/widget.h"
+#include "ui/wm/core/shadow_types.h"
 
 namespace athena {
 
@@ -45,14 +46,18 @@ TEST_F(HomeCardTest, BasicTransition) {
   EXPECT_EQ(screen_height - kHomeCardMinimizedHeight,
             home_card->GetTargetBounds().y());
   EXPECT_EQ(work_area_height, home_card->GetTargetBounds().y());
+  EXPECT_EQ(wm::ShadowType::SHADOW_TYPE_NONE, wm::GetShadowType(home_card));
 
   WindowManager::GetInstance()->ToggleOverview();
   EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
   EXPECT_EQ(screen_height - kHomeCardHeight, home_card->GetTargetBounds().y());
+  EXPECT_EQ(wm::ShadowType::SHADOW_TYPE_RECTANGULAR,
+            wm::GetShadowType(home_card));
 
   WindowManager::GetInstance()->ToggleOverview();
   EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
   EXPECT_EQ(work_area_height, home_card->GetTargetBounds().y());
+  EXPECT_EQ(wm::ShadowType::SHADOW_TYPE_NONE, wm::GetShadowType(home_card));
 }
 
 TEST_F(HomeCardTest, VirtualKeyboardTransition) {
@@ -69,7 +74,12 @@ TEST_F(HomeCardTest, VirtualKeyboardTransition) {
   EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
   HomeCard::Get()->UpdateVirtualKeyboardBounds(vk_bounds);
   EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState());
-  EXPECT_EQ(0, GetHomeCardWindow()->GetTargetBounds().y());
+
+  aura::Window* home_card = GetHomeCardWindow();
+  EXPECT_EQ(0, home_card->GetTargetBounds().y());
+  EXPECT_EQ(wm::ShadowType::SHADOW_TYPE_RECTANGULAR,
+            wm::GetShadowType(home_card));
+
   HomeCard::Get()->UpdateVirtualKeyboardBounds(gfx::Rect());
   EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());