Index: ash/system/user/tray_user.cc |
diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc |
index 23f81a6b52e92ba10c8c024921614bf5e221aa08..60b0d8dc5bd9fad4ae8bc27089c4fb85161a8ead 100644 |
--- a/ash/system/user/tray_user.cc |
+++ b/ash/system/user/tray_user.cc |
@@ -9,6 +9,7 @@ |
#include <vector> |
#include "ash/shell.h" |
+#include "ash/shell_delegate.h" |
#include "ash/system/tray/system_tray.h" |
#include "ash/system/tray/system_tray_delegate.h" |
#include "ash/system/tray/system_tray_notifier.h" |
@@ -470,12 +471,16 @@ void UserView::Layout() { |
} |
void UserView::ButtonPressed(views::Button* sender, const ui::Event& event) { |
- if (sender == logout_button_) |
+ if (sender == logout_button_) { |
ash::Shell::GetInstance()->system_tray_delegate()->SignOut(); |
- else if (sender == profile_picture_) |
- ash::Shell::GetInstance()->system_tray_delegate()->ChangeProfilePicture(); |
- else |
+ } else if (sender == profile_picture_) { |
+ if (ash::Shell::GetInstance()->delegate()->IsMultiProfilesEnabled()) |
+ ash::Shell::GetInstance()->system_tray_delegate()->ShowUserLogin(); |
+ else |
+ ash::Shell::GetInstance()->system_tray_delegate()->ChangeProfilePicture(); |
+ } else { |
NOTREACHED(); |
+ } |
} |
void UserView::AddLogoutButton(ash::user::LoginStatus login) { |