| Index: athena/home/home_card_unittest.cc
 | 
| diff --git a/athena/home/home_card_unittest.cc b/athena/home/home_card_unittest.cc
 | 
| deleted file mode 100644
 | 
| index 03e137eeb7932d17546975d22285ba2879637958..0000000000000000000000000000000000000000
 | 
| --- a/athena/home/home_card_unittest.cc
 | 
| +++ /dev/null
 | 
| @@ -1,319 +0,0 @@
 | 
| -// 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/home/home_card_constants.h"
 | 
| -#include "athena/home/home_card_impl.h"
 | 
| -#include "athena/home/home_card_view.h"
 | 
| -#include "athena/test/base/athena_test_base.h"
 | 
| -#include "athena/test/base/test_windows.h"
 | 
| -#include "athena/wm/public/window_manager.h"
 | 
| -#include "ui/app_list/app_list_model.h"
 | 
| -#include "ui/app_list/app_list_view_delegate.h"
 | 
| -#include "ui/app_list/views/app_list_main_view.h"
 | 
| -#include "ui/app_list/views/contents_view.h"
 | 
| -#include "ui/aura/test/test_window_delegate.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"
 | 
| -#include "ui/wm/core/window_util.h"
 | 
| -
 | 
| -namespace athena {
 | 
| -
 | 
| -aura::Window* GetHomeCardWindow() {
 | 
| -  return static_cast<HomeCardImpl*>(HomeCard::Get())->
 | 
| -      GetHomeCardWindowForTest();
 | 
| -}
 | 
| -
 | 
| -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());
 | 
| -
 | 
| -  WindowManager::Get()->EnterOverview();
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
 | 
| -  EXPECT_EQ(screen_height - kHomeCardHeight, home_card->GetTargetBounds().y());
 | 
| -
 | 
| -  WindowManager::Get()->ExitOverview();
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
 | 
| -  EXPECT_EQ(work_area_height, home_card->GetTargetBounds().y());
 | 
| -}
 | 
| -
 | 
| -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::Get()->EnterOverview();
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
 | 
| -  HomeCard::Get()->UpdateVirtualKeyboardBounds(vk_bounds);
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState());
 | 
| -
 | 
| -  aura::Window* home_card = GetHomeCardWindow();
 | 
| -  EXPECT_EQ(0, home_card->GetTargetBounds().y());
 | 
| -
 | 
| -  HomeCard::Get()->UpdateVirtualKeyboardBounds(gfx::Rect());
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
 | 
| -}
 | 
| -
 | 
| -TEST_F(HomeCardTest, ToggleOverviewWithVirtualKeyboard) {
 | 
| -  // 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());
 | 
| -
 | 
| -  // EnterOverview() revives the bottom home card. Home card also gets
 | 
| -  /// activated which will close the virtual keyboard.
 | 
| -  WindowManager::Get()->EnterOverview();
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
 | 
| -  aura::Window* home_card = GetHomeCardWindow();
 | 
| -  EXPECT_TRUE(wm::IsActiveWindow(home_card));
 | 
| -}
 | 
| -
 | 
| -// Verify if the home card is correctly minimized after app launch.
 | 
| -TEST_F(HomeCardTest, AppSelection) {
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
 | 
| -
 | 
| -  WindowManager::Get()->EnterOverview();
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
 | 
| -
 | 
| -  athena::ActivityFactory::Get()->CreateWebActivity(
 | 
| -      nullptr, base::string16(), GURL("http://www.google.com/"));
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
 | 
| -}
 | 
| -
 | 
| -TEST_F(HomeCardTest, Accelerators) {
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
 | 
| -
 | 
| -  ui::test::EventGenerator generator(root_window());
 | 
| -
 | 
| -  // CTRL+L toggles centered home card, check that overview mode follows
 | 
| -  generator.PressKey(ui::VKEY_L, ui::EF_CONTROL_DOWN);
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState());
 | 
| -  EXPECT_TRUE(WindowManager::Get()->IsOverviewModeActive());
 | 
| -  generator.PressKey(ui::VKEY_L, ui::EF_CONTROL_DOWN);
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
 | 
| -  EXPECT_FALSE(WindowManager::Get()->IsOverviewModeActive());
 | 
| -
 | 
| -  // ESC key hides centered home card
 | 
| -  generator.PressKey(ui::VKEY_L, ui::EF_CONTROL_DOWN);
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState());
 | 
| -  EXPECT_TRUE(WindowManager::Get()->IsOverviewModeActive());
 | 
| -  generator.PressKey(ui::VKEY_ESCAPE, ui::EF_NONE);
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
 | 
| -  EXPECT_FALSE(WindowManager::Get()->IsOverviewModeActive());
 | 
| -
 | 
| -  // Do nothing with bottom home card with CTRL+L, hide with ESC key
 | 
| -  WindowManager::Get()->EnterOverview();
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
 | 
| -  EXPECT_TRUE(WindowManager::Get()->IsOverviewModeActive());
 | 
| -  generator.PressKey(ui::VKEY_L, ui::EF_CONTROL_DOWN);
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
 | 
| -  EXPECT_TRUE(WindowManager::Get()->IsOverviewModeActive());
 | 
| -  generator.PressKey(ui::VKEY_ESCAPE, ui::EF_NONE);
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
 | 
| -  EXPECT_FALSE(WindowManager::Get()->IsOverviewModeActive());
 | 
| -
 | 
| -  // Do nothing if the centered state is a temporary state.
 | 
| -  WindowManager::Get()->EnterOverview();
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
 | 
| -  EXPECT_TRUE(WindowManager::Get()->IsOverviewModeActive());
 | 
| -  HomeCard::Get()->UpdateVirtualKeyboardBounds(gfx::Rect(0, 0, 100, 100));
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState());
 | 
| -  EXPECT_TRUE(WindowManager::Get()->IsOverviewModeActive());
 | 
| -  generator.PressKey(ui::VKEY_L, ui::EF_CONTROL_DOWN);
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState());
 | 
| -  EXPECT_TRUE(WindowManager::Get()->IsOverviewModeActive());
 | 
| -}
 | 
| -
 | 
| -TEST_F(HomeCardTest, MouseClick) {
 | 
| -  ASSERT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
 | 
| -
 | 
| -  // Mouse click at the bottom of the screen should invokes overview mode and
 | 
| -  // changes the state to BOTTOM.
 | 
| -  gfx::Rect screen_rect(root_window()->bounds());
 | 
| -  ui::test::EventGenerator generator(
 | 
| -      root_window(), gfx::Point(
 | 
| -          screen_rect.x() + screen_rect.width() / 2, screen_rect.bottom() - 1));
 | 
| -  generator.ClickLeftButton();
 | 
| -
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
 | 
| -  EXPECT_TRUE(WindowManager::Get()->IsOverviewModeActive());
 | 
| -
 | 
| -  // Further clicks are simply ignored.
 | 
| -  generator.ClickLeftButton();
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
 | 
| -  EXPECT_TRUE(WindowManager::Get()->IsOverviewModeActive());
 | 
| -}
 | 
| -
 | 
| -TEST_F(HomeCardTest, Gestures) {
 | 
| -  ASSERT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
 | 
| -  ui::test::EventGenerator generator(root_window());
 | 
| -  gfx::Rect screen_rect(root_window()->bounds());
 | 
| -
 | 
| -  const int bottom = screen_rect.bottom();
 | 
| -  const int x = screen_rect.x() + 1;
 | 
| -
 | 
| -  generator.GestureScrollSequence(gfx::Point(x, bottom - 1),
 | 
| -                                  gfx::Point(x, bottom - 70),
 | 
| -                                  base::TimeDelta::FromSeconds(1),
 | 
| -                                  10);
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
 | 
| -  EXPECT_TRUE(WindowManager::Get()->IsOverviewModeActive());
 | 
| -
 | 
| -  // Too short moves. Nothing has changed.
 | 
| -  generator.GestureScrollSequence(gfx::Point(x, bottom - 40),
 | 
| -                                  gfx::Point(x, bottom - 80),
 | 
| -                                  base::TimeDelta::FromSeconds(1),
 | 
| -                                  10);
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
 | 
| -  EXPECT_TRUE(WindowManager::Get()->IsOverviewModeActive());
 | 
| -
 | 
| -  generator.GestureScrollSequence(gfx::Point(x, bottom - 40),
 | 
| -                                  gfx::Point(x, bottom - 20),
 | 
| -                                  base::TimeDelta::FromSeconds(1),
 | 
| -                                  10);
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
 | 
| -  EXPECT_TRUE(WindowManager::Get()->IsOverviewModeActive());
 | 
| -
 | 
| -  // Swipe up to the centered state.
 | 
| -  generator.GestureScrollSequence(gfx::Point(x, bottom - 40),
 | 
| -                                  gfx::Point(x, bottom - 300),
 | 
| -                                  base::TimeDelta::FromSeconds(1),
 | 
| -                                  10);
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState());
 | 
| -  EXPECT_TRUE(WindowManager::Get()->IsOverviewModeActive());
 | 
| -
 | 
| -  // Swipe up from centered; nothing has to be changed.
 | 
| -  generator.GestureScrollSequence(gfx::Point(x, bottom - 300),
 | 
| -                                  gfx::Point(x, bottom - 350),
 | 
| -                                  base::TimeDelta::FromSeconds(1),
 | 
| -                                  10);
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState());
 | 
| -  EXPECT_TRUE(WindowManager::Get()->IsOverviewModeActive());
 | 
| -
 | 
| -  // Swipe down slightly; nothing has to be changed.
 | 
| -  generator.GestureScrollSequence(gfx::Point(x, bottom - 300),
 | 
| -                                  gfx::Point(x, bottom - 250),
 | 
| -                                  base::TimeDelta::FromSeconds(1),
 | 
| -                                  10);
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState());
 | 
| -  EXPECT_TRUE(WindowManager::Get()->IsOverviewModeActive());
 | 
| -
 | 
| -  // Swipe down to the bottom state.
 | 
| -  generator.GestureScrollSequence(gfx::Point(x, 50),
 | 
| -                                  gfx::Point(x, bottom - 120),
 | 
| -                                  base::TimeDelta::FromSeconds(1), 10);
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
 | 
| -  EXPECT_TRUE(WindowManager::Get()->IsOverviewModeActive());
 | 
| -
 | 
| -  generator.GestureScrollSequence(gfx::Point(x, bottom - 40),
 | 
| -                                  gfx::Point(x, bottom - 300),
 | 
| -                                  base::TimeDelta::FromSeconds(1),
 | 
| -                                  10);
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState());
 | 
| -  EXPECT_TRUE(WindowManager::Get()->IsOverviewModeActive());
 | 
| -
 | 
| -  // Swipe down to the minimized state.
 | 
| -  generator.GestureScrollSequence(gfx::Point(x, 50), gfx::Point(x, bottom - 1),
 | 
| -                                  base::TimeDelta::FromSeconds(1), 10);
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
 | 
| -  EXPECT_FALSE(WindowManager::Get()->IsOverviewModeActive());
 | 
| -}
 | 
| -
 | 
| -TEST_F(HomeCardTest, GesturesToFullDirectly) {
 | 
| -  ASSERT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
 | 
| -  ui::test::EventGenerator generator(root_window());
 | 
| -  gfx::Rect screen_rect(root_window()->bounds());
 | 
| -
 | 
| -  const int bottom = screen_rect.bottom();
 | 
| -  const int x = screen_rect.x() + 1;
 | 
| -
 | 
| -  generator.GestureScrollSequence(gfx::Point(x, bottom - 1),
 | 
| -                                  gfx::Point(x, 20),
 | 
| -                                  base::TimeDelta::FromSeconds(1),
 | 
| -                                  10);
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState());
 | 
| -  EXPECT_TRUE(WindowManager::Get()->IsOverviewModeActive());
 | 
| -}
 | 
| -
 | 
| -TEST_F(HomeCardTest, DontMinimizeWithModalWindow) {
 | 
| -  aura::Window* home_card = GetHomeCardWindow();
 | 
| -
 | 
| -  WindowManager::Get()->EnterOverview();
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
 | 
| -  EXPECT_TRUE(wm::IsActiveWindow(home_card));
 | 
| -
 | 
| -  aura::test::TestWindowDelegate delegate;
 | 
| -  scoped_ptr<aura::Window> modal(test::CreateTransientWindow(
 | 
| -      &delegate, nullptr, ui::MODAL_TYPE_SYSTEM, false));
 | 
| -  modal->Show();
 | 
| -  wm::ActivateWindow(modal.get());
 | 
| -  EXPECT_TRUE(wm::IsActiveWindow(modal.get()));
 | 
| -  EXPECT_FALSE(wm::IsActiveWindow(home_card));
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
 | 
| -
 | 
| -  modal.reset();
 | 
| -
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
 | 
| -  EXPECT_TRUE(wm::IsActiveWindow(home_card));
 | 
| -}
 | 
| -
 | 
| -TEST_F(HomeCardTest, AppListStates) {
 | 
| -  app_list::AppListModel* model =
 | 
| -      static_cast<HomeCardImpl*>(HomeCard::Get())->view_delegate_->GetModel();
 | 
| -
 | 
| -  WindowManager::Get()->EnterOverview();
 | 
| -  ASSERT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
 | 
| -  ASSERT_EQ(app_list::AppListModel::STATE_START, model->state());
 | 
| -
 | 
| -  // Changes the contents of the home card to "apps" view, which should change
 | 
| -  // the home card state to VISIBLE_CENTERED.
 | 
| -  app_list::ContentsView* contents_view =
 | 
| -      static_cast<HomeCardImpl*>(HomeCard::Get())
 | 
| -          ->home_card_view_->main_view_->contents_view();
 | 
| -  contents_view->SetActivePage(
 | 
| -      contents_view->GetPageIndexForState(app_list::AppListModel::STATE_APPS));
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState());
 | 
| -  EXPECT_EQ(app_list::AppListModel::STATE_APPS, model->state());
 | 
| -
 | 
| -  // VISIBLE_BOTTOM state should always show the start page.
 | 
| -  HomeCard::Get()->SetState(HomeCard::VISIBLE_BOTTOM);
 | 
| -  EXPECT_EQ(app_list::AppListModel::STATE_START, model->state());
 | 
| -
 | 
| -  // VISIBLE_CENTERED with apps mode state to minimized -- and then back to
 | 
| -  // VISIBLE_BOTTOM.
 | 
| -  contents_view->SetActivePage(
 | 
| -      contents_view->GetPageIndexForState(app_list::AppListModel::STATE_APPS));
 | 
| -  EXPECT_EQ(app_list::AppListModel::STATE_APPS, model->state());
 | 
| -  WindowManager::Get()->ExitOverview();
 | 
| -  WindowManager::Get()->EnterOverview();
 | 
| -  EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, HomeCard::Get()->GetState());
 | 
| -  EXPECT_EQ(app_list::AppListModel::STATE_START, model->state());
 | 
| -}
 | 
| -
 | 
| -}  // namespace athena
 | 
| 
 |