Add mojo api for public session information

Add the following mojo api for chrome to send public session information
to LockContentsView in ash.
1. SetPublicSessionDisplayName
2. SetPublicSessionLocales

These api will be used in a follow-up CL:
https://chromium-review.googlesource.com/c/chromium/src/+/940623

Bug: 809635
Change-Id: I7b83d7188155c4c8547e8fef91aa53121dc760b3
Reviewed-on: https://chromium-review.googlesource.com/941516Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
Reviewed-by: Jacob Dufault <jdufault@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Xiaoyin Hu <xiaoyinh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541269}

ash/login/login_screen_controller.cc

@@ -172,6 +172,24 @@ void LoginScreenController::IsReadyForPassword(
   std::move(callback).Run(LockScreen::IsShown() && !is_authenticating_);
 }
 
+void LoginScreenController::SetPublicSessionDisplayName(
+    const AccountId& account_id,
+    const std::string& display_name) {
+  if (DataDispatcher())
+    DataDispatcher()->SetPublicSessionDisplayName(account_id, display_name);
+}
+
+void LoginScreenController::SetPublicSessionLocales(
+    const AccountId& account_id,
+    std::unique_ptr<base::ListValue> locales,
+    const std::string& default_locale,
+    bool show_advanced_view) {
+  if (DataDispatcher()) {
+    DataDispatcher()->SetPublicSessionLocales(
+        account_id, std::move(locales), default_locale, show_advanced_view);
+  }
+}
+
 void LoginScreenController::AuthenticateUser(const AccountId& account_id,
                                              const std::string& password,
                                              bool authenticated_by_pin,

ash/login/login_screen_controller.h

@@ -65,6 +65,12 @@ class ASH_EXPORT LoginScreenController : public mojom::LoginScreen {
                          const std::string& enterprise_info_text,
                          const std::string& bluetooth_name) override;
   void IsReadyForPassword(IsReadyForPasswordCallback callback) override;
+  void SetPublicSessionDisplayName(const AccountId& account_id,
+                                   const std::string& display_name) override;
+  void SetPublicSessionLocales(const AccountId& account_id,
+                               std::unique_ptr<base::ListValue> locales,
+                               const std::string& default_locale,
+                               bool show_advanced_view) override;
 
   // Wrappers around the mojom::LoginScreenClient interface. Hash the password
   // and send AuthenticateUser request to LoginScreenClient.

ash/login/ui/lock_contents_view.cc

@@ -481,6 +481,20 @@ void LockContentsView::OnDevChannelInfoChanged(
   LayoutTopHeader();
 }
 
+void LockContentsView::OnPublicSessionDisplayNameChanged(
+    const AccountId& account_id,
+    const std::string& display_name) {
+  NOTIMPLEMENTED();
+}
+
+void LockContentsView::OnPublicSessionLocalesChanged(
+    const AccountId& account_id,
+    const base::ListValue& locales,
+    const std::string& default_locale,
+    bool show_advanced_view) {
+  NOTIMPLEMENTED();
+}
+
 void LockContentsView::OnFocusLeavingLockScreenApps(bool reverse) {
   if (!reverse || lock_screen_apps_active_)
     FocusNextWidget(reverse);

ash/login/ui/lock_contents_view.h

@@ -104,6 +104,13 @@ class ASH_EXPORT LockContentsView : public NonAccessibleView,
   void OnDevChannelInfoChanged(const std::string& os_version_label_text,
                                const std::string& enterprise_info_text,
                                const std::string& bluetooth_name) override;
+  void OnPublicSessionDisplayNameChanged(
+      const AccountId& account_id,
+      const std::string& display_name) override;
+  void OnPublicSessionLocalesChanged(const AccountId& account_id,
+                                     const base::ListValue& locales,
+                                     const std::string& default_locale,
+                                     bool show_advanced_view) override;
 
   // SystemTrayFocusObserver:
   void OnFocusLeavingSystemTray(bool reverse) override;

ash/login/ui/login_data_dispatcher.cc

@@ -31,6 +31,16 @@ void LoginDataDispatcher::Observer::OnDevChannelInfoChanged(
     const std::string& enterprise_info_text,
     const std::string& bluetooth_name) {}
 
+void LoginDataDispatcher::Observer::OnPublicSessionDisplayNameChanged(
+    const AccountId& account_id,
+    const std::string& display_name) {}
+
+void LoginDataDispatcher::Observer::OnPublicSessionLocalesChanged(
+    const AccountId& account_id,
+    const base::ListValue& locales,
+    const std::string& default_locale,
+    bool show_advanced_view) {}
+
 LoginDataDispatcher::LoginDataDispatcher() = default;
 
 LoginDataDispatcher::~LoginDataDispatcher() = default;
@@ -83,4 +93,22 @@ void LoginDataDispatcher::SetDevChannelInfo(
   }
 }
 
+void LoginDataDispatcher::SetPublicSessionDisplayName(
+    const AccountId& account_id,
+    const std::string& display_name) {
+  for (auto& observer : observers_)
+    observer.OnPublicSessionDisplayNameChanged(account_id, display_name);
+}
+
+void LoginDataDispatcher::SetPublicSessionLocales(
+    const AccountId& account_id,
+    std::unique_ptr<base::ListValue> locales,
+    const std::string& default_locale,
+    bool show_advanced_view) {
+  for (auto& observer : observers_) {
+    observer.OnPublicSessionLocalesChanged(account_id, *locales, default_locale,
+                                           show_advanced_view);
+  }
+}
+
 }  // namespace ash

ash/login/ui/login_data_dispatcher.h

@@ -63,6 +63,20 @@ class ASH_EXPORT LoginDataDispatcher {
         const std::string& os_version_label_text,
         const std::string& enterprise_info_text,
         const std::string& bluetooth_name);
+
+    // Called when public session display name is changed for user with
+    // |account_id|.
+    virtual void OnPublicSessionDisplayNameChanged(
+        const AccountId& account_id,
+        const std::string& display_name);
+
+    // Called when public session locales are changed for user with
+    // |account_id|.
+    virtual void OnPublicSessionLocalesChanged(
+        const AccountId& account_id,
+        const base::ListValue& locales,
+        const std::string& default_locale,
+        bool show_advanced_view);
   };
 
   LoginDataDispatcher();
@@ -80,6 +94,12 @@ class ASH_EXPORT LoginDataDispatcher {
   void SetDevChannelInfo(const std::string& os_version_label_text,
                          const std::string& enterprise_info_text,
                          const std::string& bluetooth_name);
+  void SetPublicSessionDisplayName(const AccountId& account_id,
+                                   const std::string& display_name);
+  void SetPublicSessionLocales(const AccountId& account_id,
+                               std::unique_ptr<base::ListValue> locales,
+                               const std::string& default_locale,
+                               bool show_advanced_view);
 
  private:
   base::ObserverList<Observer> observers_;

ash/public/interfaces/login_screen.mojom

@@ -8,6 +8,7 @@ import "ash/public/interfaces/login_user_info.mojom";
 import "components/password_manager/public/interfaces/sync_password_data.mojom";
 import "components/proximity_auth/public/interfaces/auth_type.mojom";
 import "components/signin/public/interfaces/account_id.mojom";
+import "mojo/common/values.mojom";
 import "mojo/public/mojom/base/string16.mojom";
 
 // Allows clients (e.g. Chrome browser) to control the ash login/lock/user-add
@@ -82,6 +83,24 @@ interface LoginScreen {
 
   // Check if the login/lock screen is ready for a password.
   IsReadyForPassword() => (bool is_ready);
+
+  // Set the public session display name for user with |account_id|.
+  SetPublicSessionDisplayName(signin.mojom.AccountId account_id,
+                              string display_name);
+
+  // Set the public session locales for user with |account_id|.
+  // TODO: Use array<LocaleStruct> for |locales| instead of
+  // mojo.common.mojom.ListValue.
+  // |locales|: Available locales for this user.
+  //            Each entry is a base::DictionaryValue and it contains several
+  //            keys like displayName, nativeDisplayName, optionGroupName etc.
+  // |default_locale|: Default locale for this user.
+  // |show_advanced_view|: True if we should show the advanced expanded user
+  //                       view for the public session.
+  SetPublicSessionLocales(signin.mojom.AccountId account_id,
+                          mojo.common.mojom.ListValue locales,
+                          string default_locale,
+                          bool show_advanced_view);
 };
 
 // Allows ash lock screen to control a client (e.g. Chrome browser). Requests

chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc

@@ -36,7 +36,6 @@ namespace chromeos {
 ChromeUserSelectionScreen::ChromeUserSelectionScreen(
     const std::string& display_type)
     : UserSelectionScreen(display_type),
-      handler_initialized_(false),
       weak_factory_(this) {
   device_local_account_policy_service_ =
       g_browser_process->platform_part()
@@ -66,7 +65,7 @@ void ChromeUserSelectionScreen::Init(const user_manager::UserList& users) {
 
 void ChromeUserSelectionScreen::SendUserList() {
   UserSelectionScreen::SendUserList();
-  handler_initialized_ = true;
+  users_loaded_ = true;
 }
 
 void ChromeUserSelectionScreen::OnPolicyUpdated(const std::string& user_id) {
@@ -95,7 +94,7 @@ void ChromeUserSelectionScreen::CheckForPublicSessionDisplayNameChange(
 
   public_session_display_names_[account_id] = display_name;
 
-  if (!handler_initialized_)
+  if (!users_loaded_)
     return;
 
   if (!display_name.empty()) {
@@ -166,7 +165,7 @@ void ChromeUserSelectionScreen::SetPublicSessionDisplayName(
 void ChromeUserSelectionScreen::SetPublicSessionLocales(
     const AccountId& account_id,
     const std::vector<std::string>& recommended_locales) {
-  if (!handler_initialized_)
+  if (!users_loaded_)
     return;
 
   // Construct the list of available locales. This list consists of the

chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h

@@ -55,8 +55,6 @@ class ChromeUserSelectionScreen
       const AccountId& account_id,
       const std::vector<std::string>& recommended_locales);
 
-  bool handler_initialized_;
-
   policy::DeviceLocalAccountPolicyService* device_local_account_policy_service_;
 
   // Map from public session account IDs to their display names set by policy.

chrome/browser/chromeos/login/screens/user_selection_screen.cc

@@ -862,6 +862,10 @@ UserSelectionScreen::UpdateAndReturnUserListForMojo() {
   return user_info_list;
 }
 
+void UserSelectionScreen::SetUsersLoaded(bool loaded) {
+  users_loaded_ = loaded;
+}
+
 EasyUnlockService* UserSelectionScreen::GetEasyUnlockServiceForUser(
     const AccountId& account_id) const {
   if (GetScreenType() == OTHER_SCREEN)

chrome/browser/chromeos/login/screens/user_selection_screen.h

@@ -127,6 +127,7 @@ class UserSelectionScreen
 
   std::unique_ptr<base::ListValue> UpdateAndReturnUserListForWebUI();
   std::vector<ash::mojom::LoginUserInfoPtr> UpdateAndReturnUserListForMojo();
+  void SetUsersLoaded(bool loaded);
 
  protected:
   UserBoardView* view_ = nullptr;
@@ -135,6 +136,9 @@ class UserSelectionScreen
   std::map<AccountId, std::vector<std::string>>
       public_session_recommended_locales_;
 
+  // Whether users have been sent to the UI(WebUI or Views).
+  bool users_loaded_ = false;
+
  private:
   class DircryptoMigrationChecker;
 

chrome/browser/chromeos/login/ui/login_display_views.cc

@@ -48,6 +48,7 @@ void LoginDisplayViews::Init(const user_manager::UserList& filtered_users,
   user_selection_screen_->Init(filtered_users);
   client->LoadUsers(user_selection_screen_->UpdateAndReturnUserListForMojo(),
                     show_guest);
+  user_selection_screen_->SetUsersLoaded(true /*loaded*/);
 }
 
 void LoginDisplayViews::OnPreferencesChanged() {

chrome/browser/chromeos/login/user_selection_screen_proxy.cc

@@ -67,6 +67,23 @@ UserSelectionScreenProxy::UserSelectionScreenProxy() = default;
 
 UserSelectionScreenProxy::~UserSelectionScreenProxy() = default;
 
+void UserSelectionScreenProxy::SetPublicSessionDisplayName(
+    const AccountId& account_id,
+    const std::string& display_name) {
+  LoginScreenClient::Get()->SetPublicSessionDisplayName(account_id,
+                                                        display_name);
+}
+
+void UserSelectionScreenProxy::SetPublicSessionLocales(
+    const AccountId& account_id,
+    std::unique_ptr<base::ListValue> locales,
+    const std::string& default_locale,
+    bool multiple_recommended_locales) {
+  LoginScreenClient::Get()->SetPublicSessionLocales(
+      account_id, std::move(locales), default_locale,
+      multiple_recommended_locales);
+}
+
 void UserSelectionScreenProxy::ShowUserPodCustomIcon(
     const AccountId& account_id,
     const proximity_auth::ScreenlockBridge::UserPodCustomIconOptions&

chrome/browser/chromeos/login/user_selection_screen_proxy.h

@@ -20,11 +20,11 @@ class UserSelectionScreenProxy : public chromeos::UserBoardView {
 
   // UserBoardView:
   void SetPublicSessionDisplayName(const AccountId& account_id,
-                                   const std::string& display_name) override{};
+                                   const std::string& display_name) override;
   void SetPublicSessionLocales(const AccountId& account_id,
                                std::unique_ptr<base::ListValue> locales,
                                const std::string& default_locale,
-                               bool multiple_recommended_locales) override{};
+                               bool multiple_recommended_locales) override;
   void ShowBannerMessage(const base::string16& message) override{};
   void ShowUserPodCustomIcon(
       const AccountId& account_id,

chrome/browser/ui/ash/login_screen_client.cc

@@ -196,6 +196,21 @@ void LoginScreenClient::IsReadyForPassword(
   login_screen_->IsReadyForPassword(std::move(callback));
 }
 
+void LoginScreenClient::SetPublicSessionDisplayName(
+    const AccountId& account_id,
+    const std::string& display_name) {
+  login_screen_->SetPublicSessionDisplayName(account_id, display_name);
+}
+
+void LoginScreenClient::SetPublicSessionLocales(
+    const AccountId& account_id,
+    std::unique_ptr<base::ListValue> locales,
+    const std::string& default_locale,
+    bool show_advanced_view) {
+  login_screen_->SetPublicSessionLocales(account_id, std::move(locales),
+                                         default_locale, show_advanced_view);
+}
+
 void LoginScreenClient::SetDelegate(Delegate* delegate) {
   delegate_ = delegate;
 }

chrome/browser/ui/ash/login_screen_client.h

@@ -94,6 +94,12 @@ class LoginScreenClient : public ash::mojom::LoginScreenClient {
                          const std::string& bluetooth_name);
   void IsReadyForPassword(
       ash::mojom::LoginScreen::IsReadyForPasswordCallback callback);
+  void SetPublicSessionDisplayName(const AccountId& account_id,
+                                   const std::string& display_name);
+  void SetPublicSessionLocales(const AccountId& account_id,
+                               std::unique_ptr<base::ListValue> locales,
+                               const std::string& default_locale,
+                               bool show_advanced_view);
 
   void SetDelegate(Delegate* delegate);