Move UserInfo to user_manager.

ash/shell/shell_delegate_impl.cc

 // 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.
 
 #include "ash/shell/shell_delegate_impl.h"
 
 #include "ash/accessibility_delegate.h"
 #include "ash/default_accessibility_delegate.h"
 #include "ash/default_user_wallpaper_delegate.h"
 #include "ash/gpu_support_stub.h"
 #include "ash/media_delegate.h"
 #include "ash/new_window_delegate.h"
 #include "ash/session/session_state_delegate.h"
-#include "ash/session/user_info.h"
 #include "ash/shell/context_menu.h"
 #include "ash/shell/example_factory.h"
 #include "ash/shell/keyboard_controller_proxy_stub.h"
 #include "ash/shell/shelf_delegate_impl.h"
 #include "ash/shell/toplevel_window.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/default_system_tray_delegate.h"
 #include "ash/wm/window_state.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
+#include "components/user_manager/user_info.h"
 #include "ui/aura/window.h"
 #include "ui/wm/core/input_method_event_filter.h"
 
 namespace ash {
 namespace shell {
 namespace {
 
 class NewWindowDelegateImpl : public NewWindowDelegate {
  public:
   NewWindowDelegateImpl() {}
@@ skipping 29 matching lines @@
   virtual void HandleMediaPrevTrack() OVERRIDE {}
   virtual MediaCaptureState GetMediaCaptureState(
       content::BrowserContext* context) OVERRIDE {
     return MEDIA_CAPTURE_VIDEO;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MediaDelegateImpl);
 };
 
-class UserInfoImpl : public UserInfo {
+class UserInfoImpl : public user_manager::UserInfo {
  public:
   UserInfoImpl() {}
   virtual ~UserInfoImpl() {}
 
-  // UserInfo:
+  // user_manager::UserInfo:
   virtual base::string16 GetDisplayName() const OVERRIDE {
     return base::UTF8ToUTF16("stub-user");
   }
   virtual base::string16 GetGivenName() const OVERRIDE {
     return base::UTF8ToUTF16("Stub");
   }
   virtual std::string GetEmail() const OVERRIDE {
     return "stub-user@domain.com";
   }
   virtual std::string GetUserID() const OVERRIDE { return GetEmail(); }
@@ skipping 44 matching lines @@
     Shell::GetInstance()->UpdateShelfVisibility();
   }
   virtual bool IsUserSessionBlocked() const OVERRIDE {
     return !IsActiveUserSessionStarted() || IsScreenLocked();
   }
   virtual SessionState GetSessionState() const OVERRIDE {
     // Assume that if session is not active we're at login.
     return IsActiveUserSessionStarted() ? SESSION_STATE_ACTIVE
                                         : SESSION_STATE_LOGIN_PRIMARY;
   }
-  virtual const UserInfo* GetUserInfo(MultiProfileIndex index) const OVERRIDE {
+  virtual const user_manager::UserInfo* GetUserInfo(
+      MultiProfileIndex index) const OVERRIDE {
     return user_info_.get();
   }
-  virtual const UserInfo* GetUserInfo(
+  virtual const user_manager::UserInfo* GetUserInfo(
       content::BrowserContext* context) const OVERRIDE {
     return user_info_.get();
   }
   virtual bool ShouldShowAvatar(aura::Window* window) const OVERRIDE {
     return !user_info_->GetImage().isNull();
   }
   virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE {}
   virtual void CycleActiveUser(CycleUser cycle_user) OVERRIDE {}
   virtual void AddSessionStateObserver(
       ash::SessionStateObserver* observer) OVERRIDE {}
   virtual void RemoveSessionStateObserver(
       ash::SessionStateObserver* observer) OVERRIDE {}
 
  private:
   bool screen_locked_;
 
   // A pseudo user info.
-  scoped_ptr<UserInfo> user_info_;
+  scoped_ptr<user_manager::UserInfo> user_info_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateImpl);
 };
 
 }  // namespace
 
 ShellDelegateImpl::ShellDelegateImpl()
     : watcher_(NULL),
       shelf_delegate_(NULL),
       browser_context_(NULL) {
@@ skipping 102 matching lines @@
   // Real GPU support depends on src/content, so just use a stub.
   return new GPUSupportStub;
 }
 
 base::string16 ShellDelegateImpl::GetProductName() const {
   return base::string16();
 }
 
 }  // namespace shell
 }  // namespace ash