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

Side by Side Diff: ash/test/ash_test_base.cc

Issue 2801333002: mash: Run pre-unlock animation via SessionController (Closed)
Patch Set: rebase Created 3 years, 8 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 unified diff | Download patch
« no previous file with comments | « ash/shell_unittest.cc ('k') | ash/wm/lock_state_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/test/ash_test_base.h" 5 #include "ash/test/ash_test_base.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/display/extended_mouse_warp_controller.h" 10 #include "ash/display/extended_mouse_warp_controller.h"
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 user_adding_screen_running 333 user_adding_screen_running
334 ? session_manager::SessionState::LOGIN_SECONDARY 334 ? session_manager::SessionState::LOGIN_SECONDARY
335 : session_manager::SessionState::ACTIVE); 335 : session_manager::SessionState::ACTIVE);
336 } 336 }
337 337
338 void AshTestBase::BlockUserSession(UserSessionBlockReason block_reason) { 338 void AshTestBase::BlockUserSession(UserSessionBlockReason block_reason) {
339 switch (block_reason) { 339 switch (block_reason) {
340 case BLOCKED_BY_LOCK_SCREEN: 340 case BLOCKED_BY_LOCK_SCREEN:
341 SetSessionStarted(true); 341 SetSessionStarted(true);
342 Shell::Get()->session_controller()->LockScreenAndFlushForTest(); 342 Shell::Get()->session_controller()->LockScreenAndFlushForTest();
343 Shell::Get()->OnLockStateChanged(true);
344 break; 343 break;
345 case BLOCKED_BY_LOGIN_SCREEN: 344 case BLOCKED_BY_LOGIN_SCREEN:
346 SetSessionStarted(false); 345 SetSessionStarted(false);
347 break; 346 break;
348 case BLOCKED_BY_USER_ADDING_SCREEN: 347 case BLOCKED_BY_USER_ADDING_SCREEN:
349 SetUserAddingScreenRunning(true); 348 SetUserAddingScreenRunning(true);
350 break; 349 break;
351 default: 350 default:
352 NOTREACHED(); 351 NOTREACHED();
353 break; 352 break;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 Shell::Get()->window_tree_host_manager()->SetPrimaryDisplayId( 395 Shell::Get()->window_tree_host_manager()->SetPrimaryDisplayId(
397 display_manager()->GetSecondaryDisplay().id()); 396 display_manager()->GetSecondaryDisplay().id());
398 } 397 }
399 398
400 display::Display AshTestBase::GetSecondaryDisplay() { 399 display::Display AshTestBase::GetSecondaryDisplay() {
401 return ash_test_helper_->GetSecondaryDisplay(); 400 return ash_test_helper_->GetSecondaryDisplay();
402 } 401 }
403 402
404 } // namespace test 403 } // namespace test
405 } // namespace ash 404 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell_unittest.cc ('k') | ash/wm/lock_state_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698