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

Unified Diff: ash/test/ash_test_helper.cc

Issue 21519002: Prevent mouse from getting stuck on second display in login (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
Index: ash/test/ash_test_helper.cc
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index 1d8c7d1774798e1d8e2ff61a26e19f0806935de7..45a1740953e8ab330ebcbea6c1528f9c87a7c0c9 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -39,7 +39,7 @@ AshTestHelper::AshTestHelper(base::MessageLoopForUI* message_loop)
AshTestHelper::~AshTestHelper() {
}
-void AshTestHelper::SetUp() {
+void AshTestHelper::SetUp(bool start_session) {
// Disable animations during tests.
zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode(
ui::ScopedAnimationDurationScaleMode::ZERO_DURATION));
@@ -60,9 +60,12 @@ void AshTestHelper::SetUp() {
ash::Shell::CreateInstance(test_shell_delegate_);
Shell* shell = Shell::GetInstance();
- test_shell_delegate_->test_session_state_delegate()->
- SetActiveUserSessionStarted(true);
- test_shell_delegate_->test_session_state_delegate()->SetHasActiveUser(true);
+ if (start_session) {
+ test_shell_delegate_->test_session_state_delegate()->
+ SetActiveUserSessionStarted(true);
+ test_shell_delegate_->test_session_state_delegate()->
+ SetHasActiveUser(true);
+ }
test::DisplayManagerTestApi(shell->display_manager()).
DisableChangeDisplayUponHostResize();

Powered by Google App Engine
This is Rietveld 408576698