| Index: ash/system/tray/default_system_tray_delegate.cc
|
| diff --git a/ash/system/tray/default_system_tray_delegate.cc b/ash/system/tray/default_system_tray_delegate.cc
|
| index eae6bd3b336a4e5492a63975f86d039f0af9565d..839575beff2e7b5f7405c483a08286d4001fa0b1 100644
|
| --- a/ash/system/tray/default_system_tray_delegate.cc
|
| +++ b/ash/system/tray/default_system_tray_delegate.cc
|
| @@ -71,17 +71,17 @@ const base::string16 DefaultSystemTrayDelegate::GetEnterpriseMessage() const {
|
| }
|
|
|
| const std::string
|
| -DefaultSystemTrayDelegate::GetLocallyManagedUserManager() const {
|
| +DefaultSystemTrayDelegate::GetSupervisedUserManager() const {
|
| return std::string();
|
| }
|
|
|
| const base::string16
|
| -DefaultSystemTrayDelegate::GetLocallyManagedUserManagerName()
|
| +DefaultSystemTrayDelegate::GetSupervisedUserManagerName()
|
| const {
|
| return base::string16();
|
| }
|
|
|
| -const base::string16 DefaultSystemTrayDelegate::GetLocallyManagedUserMessage()
|
| +const base::string16 DefaultSystemTrayDelegate::GetSupervisedUserMessage()
|
| const {
|
| return base::string16();
|
| }
|
| @@ -145,7 +145,7 @@ void DefaultSystemTrayDelegate::ShowPublicAccountInfo() {
|
| void DefaultSystemTrayDelegate::ShowEnterpriseInfo() {
|
| }
|
|
|
| -void DefaultSystemTrayDelegate::ShowLocallyManagedUserInfo() {
|
| +void DefaultSystemTrayDelegate::ShowSupervisedUserInfo() {
|
| }
|
|
|
| void DefaultSystemTrayDelegate::ShowUserLogin() {
|
|
|