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

Side by Side Diff: ash/shell/example_session_controller_client.cc

Issue 2797743002: ash: Merge LoginStatus update code path (Closed)
Patch Set: fix post unlock animation not run, and tests 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
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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/example_session_controller_client.h" 5 #include "ash/shell/example_session_controller_client.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell/example_factory.h" 8 #include "ash/shell/example_factory.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 10
(...skipping 18 matching lines...) Expand all
29 DCHECK_EQ(instance, this); 29 DCHECK_EQ(instance, this);
30 instance = nullptr; 30 instance = nullptr;
31 } 31 }
32 32
33 // static 33 // static
34 ExampleSessionControllerClient* ExampleSessionControllerClient::Get() { 34 ExampleSessionControllerClient* ExampleSessionControllerClient::Get() {
35 return instance; 35 return instance;
36 } 36 }
37 37
38 void ExampleSessionControllerClient::Initialize() { 38 void ExampleSessionControllerClient::Initialize() {
39 InitializeAndBind();
msw 2017/04/05 00:15:47 nit: add a comment?
xiyuan 2017/04/05 22:29:07 Done.
39 // ash_shell has 2 users. 40 // ash_shell has 2 users.
40 CreatePredefinedUserSessions(2); 41 CreatePredefinedUserSessions(2);
41 } 42 }
42 43
43 void ExampleSessionControllerClient::RequestLockScreen() { 44 void ExampleSessionControllerClient::RequestLockScreen() {
44 TestSessionControllerClient::RequestLockScreen(); 45 TestSessionControllerClient::RequestLockScreen();
45 shell::CreateLockScreen(); 46 shell::CreateLockScreen();
46 Shell::GetInstance()->UpdateShelfVisibility(); 47 Shell::GetInstance()->UpdateShelfVisibility();
47 } 48 }
48 49
49 void ExampleSessionControllerClient::UnlockScreen() { 50 void ExampleSessionControllerClient::UnlockScreen() {
50 TestSessionControllerClient::UnlockScreen(); 51 TestSessionControllerClient::UnlockScreen();
51 Shell::GetInstance()->UpdateShelfVisibility(); 52 Shell::GetInstance()->UpdateShelfVisibility();
52 } 53 }
53 54
54 } // namespace shell 55 } // namespace shell
55 } // namespace ash 56 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698