| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/ash/session_state_delegate_views.h" | 5 #include "chrome/browser/ui/ash/session_state_delegate_views.h" |
| 6 | 6 |
| 7 #include "ash/session/user_info.h" | |
| 8 #include "base/logging.h" | 7 #include "base/logging.h" |
| 9 #include "base/strings/string16.h" | 8 #include "base/strings/string16.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "components/user_manager/user_info.h" |
| 11 #include "ui/gfx/image/image_skia.h" | 11 #include "ui/gfx/image/image_skia.h" |
| 12 | 12 |
| 13 namespace { | 13 namespace { |
| 14 | 14 |
| 15 class EmptyUserInfo : public ash::UserInfo { | 15 class EmptyUserInfo : public user_manager::UserInfo { |
| 16 public: | 16 public: |
| 17 EmptyUserInfo() {} | 17 EmptyUserInfo() {} |
| 18 virtual ~EmptyUserInfo() {} | 18 virtual ~EmptyUserInfo() {} |
| 19 | 19 |
| 20 // ash::UserInfo: | 20 // user_manager::UserInfo: |
| 21 virtual base::string16 GetDisplayName() const OVERRIDE { | 21 virtual base::string16 GetDisplayName() const OVERRIDE { |
| 22 NOTIMPLEMENTED(); | 22 NOTIMPLEMENTED(); |
| 23 return base::UTF8ToUTF16(std::string()); | 23 return base::UTF8ToUTF16(std::string()); |
| 24 } | 24 } |
| 25 virtual base::string16 GetGivenName() const OVERRIDE { | 25 virtual base::string16 GetGivenName() const OVERRIDE { |
| 26 NOTIMPLEMENTED(); | 26 NOTIMPLEMENTED(); |
| 27 return base::UTF8ToUTF16(std::string()); | 27 return base::UTF8ToUTF16(std::string()); |
| 28 } | 28 } |
| 29 virtual std::string GetEmail() const OVERRIDE { | 29 virtual std::string GetEmail() const OVERRIDE { |
| 30 NOTIMPLEMENTED(); | 30 NOTIMPLEMENTED(); |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 | 99 |
| 100 bool SessionStateDelegate::IsUserSessionBlocked() const { | 100 bool SessionStateDelegate::IsUserSessionBlocked() const { |
| 101 return false; | 101 return false; |
| 102 } | 102 } |
| 103 | 103 |
| 104 ash::SessionStateDelegate::SessionState SessionStateDelegate::GetSessionState() | 104 ash::SessionStateDelegate::SessionState SessionStateDelegate::GetSessionState() |
| 105 const { | 105 const { |
| 106 return SESSION_STATE_ACTIVE; | 106 return SESSION_STATE_ACTIVE; |
| 107 } | 107 } |
| 108 | 108 |
| 109 const ash::UserInfo* SessionStateDelegate::GetUserInfo( | 109 const user_manager::UserInfo* SessionStateDelegate::GetUserInfo( |
| 110 ash::MultiProfileIndex index) const { | 110 ash::MultiProfileIndex index) const { |
| 111 return GetUserInfo(static_cast<content::BrowserContext*>(NULL)); | 111 return GetUserInfo(static_cast<content::BrowserContext*>(NULL)); |
| 112 } | 112 } |
| 113 | 113 |
| 114 const ash::UserInfo* SessionStateDelegate::GetUserInfo( | 114 const user_manager::UserInfo* SessionStateDelegate::GetUserInfo( |
| 115 content::BrowserContext* context) const { | 115 content::BrowserContext* context) const { |
| 116 static const ash::UserInfo* kUserInfo = new EmptyUserInfo(); | 116 static const user_manager::UserInfo* kUserInfo = new EmptyUserInfo(); |
| 117 return kUserInfo; | 117 return kUserInfo; |
| 118 } | 118 } |
| 119 | 119 |
| 120 bool SessionStateDelegate::ShouldShowAvatar(aura::Window* window) const { | 120 bool SessionStateDelegate::ShouldShowAvatar(aura::Window* window) const { |
| 121 return false; | 121 return false; |
| 122 } | 122 } |
| 123 | 123 |
| 124 void SessionStateDelegate::SwitchActiveUser(const std::string& user_id) { | 124 void SessionStateDelegate::SwitchActiveUser(const std::string& user_id) { |
| 125 NOTIMPLEMENTED(); | 125 NOTIMPLEMENTED(); |
| 126 } | 126 } |
| 127 | 127 |
| 128 void SessionStateDelegate::CycleActiveUser(CycleUser cycle_user) { | 128 void SessionStateDelegate::CycleActiveUser(CycleUser cycle_user) { |
| 129 NOTIMPLEMENTED(); | 129 NOTIMPLEMENTED(); |
| 130 } | 130 } |
| 131 | 131 |
| 132 void SessionStateDelegate::AddSessionStateObserver( | 132 void SessionStateDelegate::AddSessionStateObserver( |
| 133 ash::SessionStateObserver* observer) { | 133 ash::SessionStateObserver* observer) { |
| 134 NOTIMPLEMENTED(); | 134 NOTIMPLEMENTED(); |
| 135 } | 135 } |
| 136 | 136 |
| 137 void SessionStateDelegate::RemoveSessionStateObserver( | 137 void SessionStateDelegate::RemoveSessionStateObserver( |
| 138 ash::SessionStateObserver* observer) { | 138 ash::SessionStateObserver* observer) { |
| 139 NOTIMPLEMENTED(); | 139 NOTIMPLEMENTED(); |
| 140 } | 140 } |
| OLD | NEW |