Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(307)

Unified Diff: trunk/src/athena/home/home_card_unittest.cc

Issue 414133002: Revert 285393 "Exit overview mode when a new activity is opened ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | trunk/src/athena/wm/window_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/athena/home/home_card_unittest.cc
===================================================================
--- trunk/src/athena/home/home_card_unittest.cc (revision 285397)
+++ trunk/src/athena/home/home_card_unittest.cc (working copy)
@@ -57,6 +57,10 @@
athena::ActivityFactory::Get()->CreateWebActivity(
NULL, GURL("http://www.google.com/")));
EXPECT_EQ(HomeCard::VISIBLE_MINIMIZED, HomeCard::Get()->GetState());
+
+ // Overview mode has to finish before ending test, otherwise it crashes.
+ // TODO(mukai): fix this.
+ WindowManager::GetInstance()->ToggleOverview();
}
TEST_F(HomeCardTest, Accelerators) {
@@ -80,6 +84,10 @@
EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState());
generator.PressKey(ui::VKEY_L, ui::EF_CONTROL_DOWN);
EXPECT_EQ(HomeCard::VISIBLE_CENTERED, HomeCard::Get()->GetState());
+
+ // Overview mode has to finish before ending test, otherwise it crashes.
+ // TODO(mukai): fix this.
+ WindowManager::GetInstance()->ToggleOverview();
}
} // namespace athena
« no previous file with comments | « no previous file | trunk/src/athena/wm/window_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698