kiosk: Fix kiosk session restart

components/user_manager/user.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 COMPONENTS_USER_MANAGER_USER_H_
 #define COMPONENTS_USER_MANAGER_USER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 64 matching lines @@
     DEFAULT = 2,       // Default.
     /* UNKNOWN = 3 */  // Removed.
     ONLINE = 4,        // WallpaperInfo.location denotes an URL.
     POLICY = 5,        // Controlled by policy, can't be changed by the user.
     WALLPAPER_TYPE_COUNT = 6
   };
 
   // Returns true if user type has gaia account.
   static bool TypeHasGaiaAccount(UserType user_type);
 
+  explicit User(const AccountId& account_id);
+  ~User() override;
+
   // UserInfo
   std::string GetEmail() const override;
   base::string16 GetDisplayName() const override;
   base::string16 GetGivenName() const override;
   const gfx::ImageSkia& GetImage() const override;
   const AccountId& GetAccountId() const override;
 
   // Returns the user type.
   virtual UserType GetType() const = 0;
 
   // Allows managing child status of the user. Used for RegularUser.
   virtual void SetIsChild(bool is_child);
 
   // Returns true if user has gaia account. True for users of types
   // USER_TYPE_REGULAR and USER_TYPE_CHILD.
   virtual bool HasGaiaAccount() const;
 
   // Returns true if user is supervised.
   virtual bool IsSupervised() const;
 
   // True if user image can be synced.
   virtual bool CanSyncImage() const;
 
   // The displayed (non-canonical) user email.
   virtual std::string display_email() const;
 
   // True if the user is affiliated to the device.
   virtual bool IsAffiliated() const;
 
+  // True if the user is a device local account user.
+  virtual bool IsDeviceLocalAccountUser() const;

[bartfab (slow), 2016/04/18 13:09:25]

Nit: The "User" is redundant.

[xiyuan, 2016/04/18 16:53:27]

Done.

+
   // The email the user used to log in.
   // TODO(alemate): rename this to GetUserEmail() (see crbug.com/548923)
   const std::string& email() const;
 
   // The displayed user name.
   base::string16 display_name() const { return display_name_; }
 
   // If the user has to use SAML to log in.
   bool using_saml() const { return using_saml_; }
 
@@ skipping 62 matching lines @@
   friend class chromeos::UserAddingScreenTest;
   FRIEND_TEST_ALL_PREFIXES(UserTest, DeviceLocalAccountAffiliation);
 
   // Do not allow anyone else to create new User instances.
   static User* CreateRegularUser(const AccountId& account_id);
   static User* CreateGuestUser(const AccountId& guest_account_id);
   static User* CreateKioskAppUser(const AccountId& kiosk_app_account_id);
   static User* CreateSupervisedUser(const AccountId& account_id);
   static User* CreatePublicAccountUser(const AccountId& account_id);
 
-  explicit User(const AccountId& account_id);
-  ~User() override;
-
   const std::string* GetAccountLocale() const { return account_locale_.get(); }
 
   // Setters are private so only UserManager can call them.
   void SetAccountLocale(const std::string& resolved_account_locale);
 
   void SetImage(scoped_ptr<UserImage> user_image, int image_index);
 
   void SetImageURL(const GURL& image_url);
 
   // Sets a stub image until the next |SetImage| call. |image_index| may be
@@ skipping 91 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(User);
 };
 
 // List of known users.
 using UserList = std::vector<User*>;
 
 }  // namespace user_manager
 
 #endif  // COMPONENTS_USER_MANAGER_USER_H_