Commit 363989ac authored by tfarina@chromium.org's avatar tfarina@chromium.org

ash: Constantify user methods of SystemTrayDelegate.

R=sadrul@chromium.org,sky@chromium.org

Review URL: https://chromiumcodereview.appspot.com/9584034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124932 0039d316-1c4b-4281-b951-d872f2087c98
parent bfed2673
...@@ -193,20 +193,20 @@ class DummySystemTrayDelegate : public SystemTrayDelegate { ...@@ -193,20 +193,20 @@ class DummySystemTrayDelegate : public SystemTrayDelegate {
private: private:
// SystemTrayDelegate implementation. // Overridden from SystemTrayDelegate:
virtual const std::string GetUserDisplayName() OVERRIDE { virtual const std::string GetUserDisplayName() const OVERRIDE {
return "chronos"; return "chronos";
} }
virtual const std::string GetUserEmail() OVERRIDE { virtual const std::string GetUserEmail() const OVERRIDE {
return "chr@nos"; return "chr@nos";
} }
virtual const SkBitmap& GetUserImage() OVERRIDE { virtual const SkBitmap& GetUserImage() const OVERRIDE {
return null_image_; return null_image_;
} }
virtual user::LoginStatus GetUserLoginStatus() OVERRIDE { virtual user::LoginStatus GetUserLoginStatus() const OVERRIDE {
return user::LOGGED_IN_USER; return user::LOGGED_IN_USER;
} }
......
...@@ -17,10 +17,10 @@ class SystemTrayDelegate { ...@@ -17,10 +17,10 @@ class SystemTrayDelegate {
virtual ~SystemTrayDelegate() {} virtual ~SystemTrayDelegate() {}
// Gets information about the logged in user. // Gets information about the logged in user.
virtual const std::string GetUserDisplayName() = 0; virtual const std::string GetUserDisplayName() const = 0;
virtual const std::string GetUserEmail() = 0; virtual const std::string GetUserEmail() const = 0;
virtual const SkBitmap& GetUserImage() = 0; virtual const SkBitmap& GetUserImage() const = 0;
virtual user::LoginStatus GetUserLoginStatus() = 0; virtual user::LoginStatus GetUserLoginStatus() const = 0;
// Shows settings. // Shows settings.
virtual void ShowSettings() = 0; virtual void ShowSettings() = 0;
......
...@@ -49,20 +49,20 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate, ...@@ -49,20 +49,20 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this); DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
} }
// Overridden from ash::SystemTrayDelegate. // Overridden from ash::SystemTrayDelegate:
virtual const std::string GetUserDisplayName() OVERRIDE { virtual const std::string GetUserDisplayName() const OVERRIDE {
return UserManager::Get()->logged_in_user().GetDisplayName(); return UserManager::Get()->logged_in_user().GetDisplayName();
} }
virtual const std::string GetUserEmail() OVERRIDE { virtual const std::string GetUserEmail() const OVERRIDE {
return UserManager::Get()->logged_in_user().email(); return UserManager::Get()->logged_in_user().email();
} }
virtual const SkBitmap& GetUserImage() OVERRIDE { virtual const SkBitmap& GetUserImage() const OVERRIDE {
return UserManager::Get()->logged_in_user().image(); return UserManager::Get()->logged_in_user().image();
} }
virtual ash::user::LoginStatus GetUserLoginStatus() OVERRIDE { virtual ash::user::LoginStatus GetUserLoginStatus() const OVERRIDE {
UserManager* manager = UserManager::Get(); UserManager* manager = UserManager::Get();
if (!manager->user_is_logged_in()) if (!manager->user_is_logged_in())
return ash::user::LOGGED_IN_NONE; return ash::user::LOGGED_IN_NONE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment