OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "chrome/browser/ui/ash/session_controller_client.h" | 5 #include "chrome/browser/ui/ash/session_controller_client.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
91 void SetClient(ash::mojom::SessionControllerClientPtr client) override {} | 91 void SetClient(ash::mojom::SessionControllerClientPtr client) override {} |
92 void SetSessionInfo(ash::mojom::SessionInfoPtr info) override { | 92 void SetSessionInfo(ash::mojom::SessionInfoPtr info) override { |
93 last_session_info_ = info->Clone(); | 93 last_session_info_ = info->Clone(); |
94 } | 94 } |
95 void UpdateUserSession(ash::mojom::UserSessionPtr user_session) override { | 95 void UpdateUserSession(ash::mojom::UserSessionPtr user_session) override { |
96 last_user_session_ = user_session->Clone(); | 96 last_user_session_ = user_session->Clone(); |
97 } | 97 } |
98 void SetUserSessionOrder( | 98 void SetUserSessionOrder( |
99 const std::vector<uint32_t>& user_session_order) override {} | 99 const std::vector<uint32_t>& user_session_order) override {} |
100 void StartLock(const StartLockCallback& callback) override {} | 100 void StartLock(const StartLockCallback& callback) override {} |
| 101 void NotifyChromeLockAnimationsComplete() override {} |
101 void RunUnlockAnimation(const RunUnlockAnimationCallback& callback) override { | 102 void RunUnlockAnimation(const RunUnlockAnimationCallback& callback) override { |
102 } | 103 } |
103 void NotifyChromeTerminating() override {} | 104 void NotifyChromeTerminating() override {} |
104 | 105 |
105 private: | 106 private: |
106 mojo::Binding<ash::mojom::SessionController> binding_; | 107 mojo::Binding<ash::mojom::SessionController> binding_; |
107 | 108 |
108 ash::mojom::SessionInfoPtr last_session_info_; | 109 ash::mojom::SessionInfoPtr last_session_info_; |
109 ash::mojom::UserSessionPtr last_user_session_; | 110 ash::mojom::UserSessionPtr last_user_session_; |
110 | 111 |
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
413 | 414 |
414 // Simulate an update to the custodian information. | 415 // Simulate an update to the custodian information. |
415 prefs->SetString(prefs::kSupervisedUserCustodianEmail, "parent3@test.com"); | 416 prefs->SetString(prefs::kSupervisedUserCustodianEmail, "parent3@test.com"); |
416 client.OnCustodianInfoChanged(); | 417 client.OnCustodianInfoChanged(); |
417 SessionControllerClient::FlushForTesting(); | 418 SessionControllerClient::FlushForTesting(); |
418 | 419 |
419 // The updated custodian was sent over the mojo interface. | 420 // The updated custodian was sent over the mojo interface. |
420 EXPECT_EQ("parent3@test.com", | 421 EXPECT_EQ("parent3@test.com", |
421 session_controller.last_user_session()->custodian_email); | 422 session_controller.last_user_session()->custodian_email); |
422 } | 423 } |
OLD | NEW |