[cros] UserManager cleanup regarding stub/demo users.

chrome/browser/chromeos/login/user.h

 // Copyright (c) 2012 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_USER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/string16.h"
 #include "chrome/browser/chromeos/login/user_image.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/image/image_skia.h"
 
-// The demo user is represented by a domainless username.
-const char kDemoUser[] = "demouser";
+namespace chromeos {
 
-namespace chromeos {
+// Fake username for the demo user.
+extern const char kDemoUser[];
+
+// Username for incognito login.
+extern const char kGuestUser[];
 
 // A class representing information about a previously logged in user.
 // Each user has a canonical email (username), returned by |email()| and
 // may have a different displayed email (in the raw form as entered by user),
 // returned by |displayed_email()|.
 // Displayed emails are for use in UI only, anywhere else users must be referred
 // to by |email()|.
 class User {
  public:
   // User OAuth token status according to the last check.
@@ skipping 54 matching lines @@
 
   // OAuth token status for this user.
   OAuthTokenStatus oauth_token_status() const { return oauth_token_status_; }
 
   // The displayed user name.
   string16 display_name() const { return display_name_; }
 
   // The displayed (non-canonical) user email.
   std::string display_email() const { return display_email_; }
 
-  bool is_demo_user() const { return is_demo_user_; }
-  bool is_guest() const { return is_guest_; }
+  bool is_demo_user() const { return email_ == kDemoUser; }
+  bool is_guest() const { return email_ == kGuestUser; }
 
  private:
   friend class UserManagerImpl;
   friend class MockUserManager;
   friend class UserManagerTest;
 
   // Do not allow anyone else to create new User instances.
-  User(const std::string& email, bool is_guest);
+  explicit User(const std::string& email_guest);
   ~User();
 
   // Setters are private so only UserManager can call them.
   void SetImage(const 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
   // one of |kExternalImageIndex| or |kProfileImageIndex|.
   void SetStubImage(int image_index);
@@ skipping 21 matching lines @@
   OAuthTokenStatus oauth_token_status_;
   SkBitmap wallpaper_thumbnail_;
 
   // Either index of a default image for the user, |kExternalImageIndex| or
   // |kProfileImageIndex|.
   int image_index_;
 
   // True if current user image is a stub set by a |SetStubImage| call.
   bool image_is_stub_;
 
-  // Is this a guest account?
-  bool is_guest_;
-
-  // Is this a demo user account?
-  bool is_demo_user_;
-
   DISALLOW_COPY_AND_ASSIGN(User);
 };
 
 // List of known users.
 typedef std::vector<User*> UserList;
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USER_H_