Cleanup home card shadow code.

athena/home/home_card_unittest.cc

 // Copyright 2014 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 "athena/home/public/home_card.h"
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/home/home_card_constants.h"
 #include "athena/home/home_card_impl.h"
 #include "athena/test/athena_test_base.h"
 #include "athena/wm/public/window_manager.h"
 #include "ui/aura/window.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #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 {
 
 aura::Window* GetHomeCardWindow() {
   return static_cast<HomeCardImpl*>(HomeCard::Get())->
       GetHomeCardWindowForTest();
 }
 
 // Returns true if the keyboard focus is on the search box.
 bool IsSearchBoxFocused(aura::Window* home_card) {
   return views::Widget::GetWidgetForNativeWindow(home_card)->
       GetContentsView()->GetViewByID(kHomeCardSearchBoxId)->HasFocus();
 }
 
 typedef test::AthenaTestBase HomeCardTest;
 
 TEST_F(HomeCardTest, BasicTransition) {
   ASSERT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
   aura::Window* home_card = GetHomeCardWindow();
   const int screen_height = root_window()->bounds().height();
   const int work_area_height = gfx::Screen::GetScreenFor(root_window())->
       GetDisplayNearestWindow(root_window()).work_area().height();
   ASSERT_TRUE(home_card);
 
   // In the minimized state, home card should be outside (below) the work area.
   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) {
   // Minimized -> Hidden for virtual keyboard.
   EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
   const gfx::Rect vk_bounds(0, 0, 100, 100);
   HomeCard::Get()->UpdateVirtualKeyboardBounds(vk_bounds);
   EXPECT_EQ(HomeCard::HIDDEN, HomeCard::Get()->GetState());
   HomeCard::Get()->UpdateVirtualKeyboardBounds(gfx::Rect());
   EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
 
   // bottom -> centered for virtual keyboard.
   WindowManager::GetInstance()->ToggleOverview();
   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());
 
   // Overview mode has to finish before ending test, otherwise it crashes.
   // TODO(mukai): fix this.
   WindowManager::GetInstance()->ToggleOverview();
 }
 
 // Verify if the home card is correctly minimized after app launch.
 TEST_F(HomeCardTest, AppSelection) {
@@ skipping 169 matching lines @@
 
   generator.GestureScrollSequence(gfx::Point(x, 10),
                                   gfx::Point(x, bottom - 100),
                                   base::TimeDelta::FromSeconds(1),
                                   10);
   EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
   EXPECT_FALSE(IsSearchBoxFocused(home_card));
 }
 
 }  // namespace athena