CleanUp: Introduce UserInfo. Move session_state stuff to ash/session.

chrome/browser/ui/ash/session_state_delegate_views.cc

 // Copyright (c) 2013 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 "chrome/browser/ui/ash/session_state_delegate_views.h"
 
+#include "ash/session/user_info.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace {
-// This isn't really used. It is mainly here to make the compiler happy.
-gfx::ImageSkia null_image;
-}
+
+class EmptyUserInfo : public ash::UserInfo {
+ public:
+  EmptyUserInfo() {}
+  virtual ~EmptyUserInfo() {}
+
+  // ash::UserInfo:
+  virtual base::string16 GetDisplayName() const OVERRIDE {
+    NOTIMPLEMENTED();
+    return base::UTF8ToUTF16(std::string());
+  }
+  virtual base::string16 GetGivenName() const OVERRIDE {
+    NOTIMPLEMENTED();
+    return base::UTF8ToUTF16(std::string());
+  }
+  virtual std::string GetEmail() const OVERRIDE {
+    NOTIMPLEMENTED();
+    return std::string();
+  }
+  virtual std::string GetUserID() const OVERRIDE {
+    NOTIMPLEMENTED();
+    return std::string();
+  }
+
+  virtual const gfx::ImageSkia& GetImage() const OVERRIDE {
+    NOTIMPLEMENTED();
+    // To make the compiler happy.
+    return null_image_;
+  }
+
+ private:
+  const gfx::ImageSkia null_image_;
+
+  DISALLOW_COPY_AND_ASSIGN(EmptyUserInfo);
+};
+
+}  // namespace
 
 SessionStateDelegate::SessionStateDelegate() {
 }
 
 SessionStateDelegate::~SessionStateDelegate() {
 }
 
 content::BrowserContext* SessionStateDelegate::GetBrowserContextByIndex(
     ash::MultiProfileIndex index) {
   NOTIMPLEMENTED();
@@ skipping 38 matching lines @@
 
 bool SessionStateDelegate::IsUserSessionBlocked() const {
   return false;
 }
 
 ash::SessionStateDelegate::SessionState SessionStateDelegate::GetSessionState()
     const {
   return SESSION_STATE_ACTIVE;
 }
 
-const base::string16 SessionStateDelegate::GetUserDisplayName(
+const ash::UserInfo* SessionStateDelegate::GetUserInfo(
     ash::MultiProfileIndex index) const {
-  NOTIMPLEMENTED();
-  return base::UTF8ToUTF16("");
+  return GetUserInfo(NULL);
 }
 
-const base::string16 SessionStateDelegate::GetUserGivenName(
-    ash::MultiProfileIndex index) const {
-  NOTIMPLEMENTED();
-  return base::UTF8ToUTF16("");
+const ash::UserInfo* SessionStateDelegate::GetUserInfo(
+    content::BrowserContext* context) const {
+  static const ash::UserInfo* kUserInfo = new EmptyUserInfo();
+  return kUserInfo;
 }
 
-const std::string SessionStateDelegate::GetUserEmail(
-    ash::MultiProfileIndex index) const {
-  NOTIMPLEMENTED();
-  return "";
-}
-
-const std::string SessionStateDelegate::GetUserID(
-    ash::MultiProfileIndex index) const {
-  NOTIMPLEMENTED();
-  return "";
-}
-
-const gfx::ImageSkia& SessionStateDelegate::GetUserImage(
-    content::BrowserContext* context) const {
-  NOTIMPLEMENTED();
-  // To make the compiler happy.
-  return null_image;
-}
-
-bool SessionStateDelegate::ShouldShowAvatar(aura::Window* window) {
+bool SessionStateDelegate::ShouldShowAvatar(aura::Window* window) const {
   return false;
 }
 
 void SessionStateDelegate::SwitchActiveUser(const std::string& user_id) {
   NOTIMPLEMENTED();
 }
 
 void SessionStateDelegate::CycleActiveUser(CycleUser cycle_user) {
   NOTIMPLEMENTED();
 }
 
 void SessionStateDelegate::AddSessionStateObserver(
     ash::SessionStateObserver* observer) {
   NOTIMPLEMENTED();
 }
 
 void SessionStateDelegate::RemoveSessionStateObserver(
     ash::SessionStateObserver* observer) {
   NOTIMPLEMENTED();
 }