ash: Add checks for supervised users.

components/user_manager/user.cc

 // 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.
 
 #include "components/user_manager/user.h"
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 10 matching lines @@
 std::string GetUserName(const std::string& email) {
   std::string::size_type i = email.find('@');
   if (i == 0 || i == std::string::npos) {
     return email;
   }
   return email.substr(0, i);
 }
 
 }  // namespace
 
+bool User::IsSupervised() const {
+  return false;
+}
+
+void User::SetIsSupervised(bool is_supervised) {
+  VLOG(1) << "Setting user is supervised to " << is_supervised;

[Marc Treib, 2014/09/15 08:20:51]

I just noticed: I think this should say something different to the RegularUser
implementation, and probably be at least a LOG(WARNING)? This shouldn't ever be
called, after all.

[merkulova, 2014/09/18 08:51:29]

Done.

+}
+
 class RegularUser : public User {
  public:
   explicit RegularUser(const std::string& email);
   virtual ~RegularUser();
 
   // Overridden from User:
   virtual UserType GetType() const OVERRIDE;
   virtual bool CanSyncImage() const OVERRIDE;
+  virtual void SetIsSupervised(bool is_supervised) OVERRIDE {
+    VLOG(1) << "Setting user is supervised to " << is_supervised;
+    is_supervised_ = is_supervised;
+  }
+  virtual bool IsSupervised() const OVERRIDE {
+    return is_supervised_;
+  }
 
  private:
+  bool is_supervised_;
+
   DISALLOW_COPY_AND_ASSIGN(RegularUser);
 };
 
 class GuestUser : public User {
  public:
   GuestUser();
   virtual ~GuestUser();
 
   // Overridden from User:
   virtual UserType GetType() const OVERRIDE;
@@ skipping 14 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(KioskAppUser);
 };
 
 class SupervisedUser : public User {
  public:
   explicit SupervisedUser(const std::string& username);
   virtual ~SupervisedUser();
 
   // Overridden from User:
   virtual UserType GetType() const OVERRIDE;
+  virtual bool IsSupervised() const OVERRIDE;
   virtual std::string display_email() const OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SupervisedUser);
 };
 
 class RetailModeUser : public User {
  public:
   RetailModeUser();
   virtual ~RetailModeUser();
@@ skipping 186 matching lines @@
 }
 
 UserType SupervisedUser::GetType() const {
   return user_manager::USER_TYPE_SUPERVISED;
 }
 
 std::string SupervisedUser::display_email() const {
   return base::UTF16ToUTF8(display_name());
 }
 
+bool SupervisedUser::IsSupervised() const {
+  return true;
+}
+
 RetailModeUser::RetailModeUser() : User(chromeos::login::kRetailModeUserName) {
   set_display_email(std::string());
 }
 
 RetailModeUser::~RetailModeUser() {
 }
 
 UserType RetailModeUser::GetType() const {
   return user_manager::USER_TYPE_RETAIL_MODE;
 }
@@ skipping 19 matching lines @@
     case user_manager::USER_TYPE_SUPERVISED:
     case user_manager::USER_TYPE_KIOSK_APP:
       return false;
     default:
       NOTREACHED();
   }
   return false;
 }
 
 }  // namespace user_manager