Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..."

trunk/src/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 "ash/session/user_info.h"
 #include "base/basictypes.h"
 #include "base/strings/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"
 
 namespace chromeos {
 
 extern const int kDefaultImagesCount;
 
@@ skipping 41 matching lines @@
   bool using_oauth;
   AuthFlow auth_flow;
 };
 
 // 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 ash::UserInfo {
+class User {
  public:
   // The user type. Used in a histogram; do not modify existing types.
   typedef enum {
     // Regular user, has a user name and password.
     USER_TYPE_REGULAR = 0,
     // Guest user, logs in without authentication.
     USER_TYPE_GUEST = 1,
     // Retail mode user, logs in without authentication. This is a special user
     // type used in retail mode only.
     USER_TYPE_RETAIL_MODE = 2,
@@ skipping 33 matching lines @@
     POLICY = 5,        // Controlled by policy, can't be changed by the user.
     WALLPAPER_TYPE_COUNT = 6
   };
 
   // Returns the user type.
   virtual UserType GetType() const = 0;
 
   // The email the user used to log in.
   const std::string& email() const { return email_; }
 
-  // The displayed user name.
-  base::string16 display_name() const { return display_name_; }
+  // Returns the human name to display for this user.
+  base::string16 GetDisplayName() const;
 
-  // ash::UserInfo
-  virtual std::string GetEmail() const OVERRIDE;
-  virtual base::string16 GetDisplayName() const OVERRIDE;
-  virtual base::string16 GetGivenName() const OVERRIDE;
-  virtual const gfx::ImageSkia& GetImage() const OVERRIDE;
-  virtual std::string GetUserID() const OVERRIDE;
+  // Returns given name of user, or empty string if given name is unknown.
+  const base::string16& given_name() const { return given_name_; }
 
   // Returns the account name part of the email. Use the display form of the
   // email if available and use_display_name == true. Otherwise use canonical.
   std::string GetAccountName(bool use_display_email) const;
 
+  // The image for this user.
+  const gfx::ImageSkia& image() const { return user_image_.image(); }
+
   // Whether the user has a default image.
   bool HasDefaultImage() const;
 
   // True if user image can be synced.
   virtual bool CanSyncImage() const;
 
   int image_index() const { return image_index_; }
   bool has_raw_image() const { return user_image_.has_raw_image(); }
   // Returns raw representation of static user image.
   const UserImage::RawImage& raw_image() const {
@@ skipping 12 matching lines @@
   // Returns the URL of user image, if there is any. Currently only the profile
   // image has a URL, for other images empty URL is returned.
   GURL image_url() const { return user_image_.url(); }
 
   // True if user image is a stub (while real image is being loaded from file).
   bool image_is_stub() const { return image_is_stub_; }
 
   // True if image is being loaded from file.
   bool image_is_loading() const { return image_is_loading_; }
 
+  // The displayed user name.
+  base::string16 display_name() const { return display_name_; }
+
   // The displayed (non-canonical) user email.
   virtual std::string display_email() const;
 
   // OAuth token status for this user.
   OAuthTokenStatus oauth_token_status() const { return oauth_token_status_; }
 
   // Whether online authentication against GAIA should be enforced during the
   // user's next sign-in.
   bool force_online_signin() const { return force_online_signin_; }
 
@@ skipping 137 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(User);
 };
 
 // List of known users.
 typedef std::vector<User*> UserList;
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USER_H_