Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / ash / session_state_delegate_views.h

diff --git a/src/chrome/browser/ui/ash/session_state_delegate_views.h b/src/chrome/browser/ui/ash/session_state_delegate_views.h
index 3b32b29..421d11c 100644 (file)
--- a/src/chrome/browser/ui/ash/session_state_delegate_views.h
+++ b/src/chrome/browser/ui/ash/session_state_delegate_views.h
@@ -35,13 +35,14 @@ class SessionStateDelegate : public ash::SessionStateDelegate {
   virtual void UnlockScreen() OVERRIDE;
   virtual bool IsUserSessionBlocked() const OVERRIDE;
   virtual SessionState GetSessionState() const OVERRIDE;
-  virtual const ash::UserInfo* GetUserInfo(
+  virtual const user_manager::UserInfo* GetUserInfo(
       ash::MultiProfileIndex index) const OVERRIDE;
-  virtual const ash::UserInfo* GetUserInfo(
+  virtual const user_manager::UserInfo* GetUserInfo(
       content::BrowserContext* context) const OVERRIDE;
   virtual bool ShouldShowAvatar(aura::Window* window) const OVERRIDE;
   virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE;
   virtual void CycleActiveUser(CycleUser cycle_user) OVERRIDE;
+  virtual bool IsMultiProfileAllowedByPrimaryUserPolicy() const OVERRIDE;
   virtual void AddSessionStateObserver(
       ash::SessionStateObserver* observer) OVERRIDE;
   virtual void RemoveSessionStateObserver(