OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/shell.h" | 5 #include "ash/shell.h" |
6 #include "ash/test/ash_test_base.h" | 6 #include "ash/test/ash_test_base.h" |
7 #include "ash/test/test_session_state_delegate.h" | 7 #include "ash/test/test_session_state_delegate.h" |
8 #include "ash/test/test_shell_delegate.h" | 8 #include "ash/test/test_shell_delegate.h" |
9 #include "ash/wm/window_state.h" | 9 #include "ash/wm/window_state.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 AshTestBase::TearDown(); | 222 AshTestBase::TearDown(); |
223 } | 223 } |
224 | 224 |
225 void WallpaperPrivateApiMultiUserUnittest::SetUpMultiUserWindowManager( | 225 void WallpaperPrivateApiMultiUserUnittest::SetUpMultiUserWindowManager( |
226 const std::string& active_user_id, | 226 const std::string& active_user_id, |
227 chrome::MultiUserWindowManager::MultiProfileMode mode) { | 227 chrome::MultiUserWindowManager::MultiProfileMode mode) { |
228 multi_user_window_manager_ = | 228 multi_user_window_manager_ = |
229 new chrome::MultiUserWindowManagerChromeOS(active_user_id); | 229 new chrome::MultiUserWindowManagerChromeOS(active_user_id); |
230 chrome::MultiUserWindowManager::SetInstanceForTest( | 230 chrome::MultiUserWindowManager::SetInstanceForTest( |
231 multi_user_window_manager_, mode); | 231 multi_user_window_manager_, mode); |
| 232 // We do not want animations while the test is going on. |
| 233 multi_user_window_manager_->SetAnimationsForTest(true); |
232 EXPECT_TRUE(multi_user_window_manager_); | 234 EXPECT_TRUE(multi_user_window_manager_); |
233 } | 235 } |
234 | 236 |
235 void WallpaperPrivateApiMultiUserUnittest::SwitchActiveUser( | 237 void WallpaperPrivateApiMultiUserUnittest::SwitchActiveUser( |
236 const std::string& active_user_id) { | 238 const std::string& active_user_id) { |
237 fake_user_manager()->SwitchActiveUser(active_user_id); | 239 fake_user_manager()->SwitchActiveUser(active_user_id); |
238 multi_user_window_manager_->ActiveUserChanged(active_user_id); | 240 multi_user_window_manager_->ActiveUserChanged(active_user_id); |
239 } | 241 } |
240 | 242 |
241 // In multi profile mode, user may open wallpaper picker in one profile and | 243 // In multi profile mode, user may open wallpaper picker in one profile and |
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
393 scoped_refptr<TestRestoreFunction> restore_function_1( | 395 scoped_refptr<TestRestoreFunction> restore_function_1( |
394 new TestRestoreFunction()); | 396 new TestRestoreFunction()); |
395 EXPECT_TRUE(restore_function_1->RunImpl()); | 397 EXPECT_TRUE(restore_function_1->RunImpl()); |
396 | 398 |
397 EXPECT_FALSE(window1_state->IsMinimized()); | 399 EXPECT_FALSE(window1_state->IsMinimized()); |
398 EXPECT_FALSE(window2_state->IsMinimized()); | 400 EXPECT_FALSE(window2_state->IsMinimized()); |
399 EXPECT_FALSE(window3_state->IsMinimized()); | 401 EXPECT_FALSE(window3_state->IsMinimized()); |
400 } | 402 } |
401 | 403 |
402 } // namespace chromeos | 404 } // namespace chromeos |
OLD | NEW |