kiosk: Fix kiosk session restart

chrome/browser/chromeos/login/users/chrome_user_manager_impl.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_CHROME_USER_MANAGER_IMPL_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_CHROME_USER_MANAGER_IMPL_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/synchronization/lock.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/login/easy_unlock/bootstrap_manager.h"
 #include "chrome/browser/chromeos/login/user_flow.h"
 #include "chrome/browser/chromeos/login/users/affiliation.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller_delegate.h"
 #include "chrome/browser/chromeos/policy/cloud_external_data_policy_observer.h"
+#include "chrome/browser/chromeos/policy/device_local_account.h"
 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class PrefRegistrySimple;
 class PrefService;
 class ProfileSyncService;
 
 namespace gfx {
 class ImageSkia;
 }
 
-namespace policy {
-struct DeviceLocalAccount;
-}
-
 namespace user_manager {
 class RemoveUserDelegate;
 }
 
 namespace chromeos {
 
 class MultiProfileUserController;
 class SupervisedUserManagerImpl;
 class SessionLengthLimiter;
 
@@ skipping 90 matching lines @@
       const std::string& user_email,
       const AffiliationIDSet& user_affiliation_ids) override;
 
  protected:
   const std::string& GetApplicationLocale() const override;
   PrefService* GetLocalState() const override;
   void HandleUserOAuthTokenStatusChange(
       const AccountId& account_id,
       user_manager::User::OAuthTokenStatus status) const override;
   bool IsEnterpriseManaged() const override;
-  void LoadPublicAccounts(std::set<AccountId>* users_set) override;
+  void LoadDeviceLocalAccounts(std::set<AccountId>* users_set) override;
   void NotifyOnLogin() override;
   void NotifyUserAddedToSession(const user_manager::User* added_user,
                                 bool user_switch_pending) override;
   void PerformPreUserListLoadingActions() override;
   void PerformPostUserListLoadingActions() override;
   void PerformPostUserLoggedInActions(bool browser_restart) override;
   void RemoveNonCryptohomeData(const AccountId& account_id) override;
   void RemoveUserInternal(const AccountId& account_id,
                           user_manager::RemoveUserDelegate* delegate) override;
   bool IsDemoApp(const AccountId& account_id) const override;
-  bool IsKioskApp(const AccountId& account_id) const override;
   bool IsPublicAccountMarkedForRemoval(
       const AccountId& account_id) const override;
   void DemoAccountLoggedIn() override;
   void GuestUserLoggedIn() override;
-  void KioskAppLoggedIn(const AccountId& kiosk_app_account_id) override;
+  void KioskAppLoggedIn(user_manager::User* user) override;
   void PublicAccountUserLoggedIn(user_manager::User* user) override;
   void RegularUserLoggedIn(const AccountId& account_id) override;
   void RegularUserLoggedInAsEphemeral(const AccountId& account_id) override;
   void SupervisedUserLoggedIn(const AccountId& account_id) override;
   bool HasPendingBootstrap(const AccountId& account_id) const override;
 
  private:
   friend class SupervisedUserManagerImpl;
   friend class UserManagerTest;
   friend class WallpaperManager;
   friend class WallpaperManagerTest;
 
   using UserImageManagerMap =
       base::hash_map<AccountId, linked_ptr<UserImageManager> >;
 
   ChromeUserManagerImpl();
 
   // Retrieves trusted device policies and removes users from the persistent
   // list if ephemeral users are enabled. Schedules a callback to itself if
   // trusted device policies are not yet available.
   void RetrieveTrustedDevicePolicies();
 
   // Updates current user ownership on UI thread.
   void UpdateOwnership();
 
-  // If data for a public account is marked as pending removal and the user is
-  // no longer logged into that account, removes the data.
-  void CleanUpPublicAccountNonCryptohomeDataPendingRemoval();
+  // If data for a device local account is marked as pending removal and the
+  // user is no longer logged into that account, removes the data.
+  void CleanUpDeviceLocalAccountNonCryptohomeDataPendingRemoval();
 
-  // Removes data belonging to public accounts that are no longer found on the
-  // user list. If the user is currently logged into one of these accounts, the
-  // data for that account is not removed immediately but marked as pending
+  // Removes data belonging to device local accounts that are no longer found on
+  // the user list. If the user is currently logged into one of these accounts,
+  // the data for that account is not removed immediately but marked as pending
   // removal after logout.
-  void CleanUpPublicAccountNonCryptohomeData(
+  void CleanUpDeviceLocalAccountNonCryptohomeData(
       const std::vector<std::string>& old_public_accounts);

[bartfab (slow), 2016/04/12 15:08:13]

Nit: s/old_public_accounts/old_device_local_accounts/

[xiyuan, 2016/04/12 16:22:51]

Done.

 
-  // Replaces the list of public accounts with those found in
+  // Replaces the list of device local accounts with those found in
   // |device_local_accounts|. Ensures that data belonging to accounts no longer
   // on the list is removed. Returns |true| if the list has changed.
-  // Public accounts are defined by policy. This method is called whenever an
-  // updated list of public accounts is received from policy.
-  bool UpdateAndCleanUpPublicAccounts(
+  // Device local accounts are defined by policy. This method is called whenever
+  // an updated list of device local accounts is received from policy.
+  bool UpdateAndCleanUpDeviceLocalAccounts(
       const std::vector<policy::DeviceLocalAccount>& device_local_accounts);
 
   // Updates the display name for public account |username| from policy settings
   // associated with that username.
   void UpdatePublicAccountDisplayName(const std::string& user_id);
 
   // Notifies the UI about a change to the user list.
   void NotifyUserListChanged();
 
   // Lazily creates default user flow.
@@ skipping 11 matching lines @@
   // Starts (or stops) automatic timezone refresh on geolocation,
   // depending on user preferences.
   void UpdateUserTimeZoneRefresher(Profile* profile);
 
   // Adds user to the list of the users who should be reported.
   void AddReportingUser(const AccountId& account_id);
 
   // Removes user from the list of the users who should be reported.
   void RemoveReportingUser(const AccountId& account_id);
 
+  // Creates a user for the given device local account.
+  user_manager::User* CreateUserFromDeviceLocalAccount(

[bartfab (slow), 2016/04/12 15:08:13]

Nit: Return an std::unique_ptr to indicate ownership transfer.

[xiyuan, 2016/04/12 16:22:51]

Done. Also moved User's ctor/dtor to public to work with std::unique_ptr.

+      const AccountId& account_id,
+      const policy::DeviceLocalAccount::Type type) const;
+
   // Interface to the signed settings store.
   CrosSettings* cros_settings_;
 
   // Interface to device-local account definitions and associated policy.
   policy::DeviceLocalAccountPolicyService* device_local_account_policy_service_;
 
   content::NotificationRegistrar registrar_;
 
   // User avatar managers.
   UserImageManagerMap user_image_managers_;
@@ skipping 27 matching lines @@
   scoped_ptr<BootstrapManager> bootstrap_manager_;
 
   base::WeakPtrFactory<ChromeUserManagerImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeUserManagerImpl);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_CHROME_USER_MANAGER_IMPL_H_