Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2413)

Unified Diff: ash/system/user/login_status.cc

Issue 14756019: Adding new user menu section to the SystemTrayMenu & refactoring of user access (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/system/user/login_status.cc
diff --git a/ash/system/user/login_status.cc b/ash/system/user/login_status.cc
index 77fc04a70b8f1abf739e2668fd1a7ec94733f4dc..515a1118853a570ac8821c3efee70a0d5ffe2c35 100644
--- a/ash/system/user/login_status.cc
+++ b/ash/system/user/login_status.cc
@@ -4,6 +4,8 @@
#include "ash/system/user/login_status.h"
+#include "ash/session_state_delegate.h"
+#include "ash/shell.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "grit/ash_strings.h"
@@ -26,7 +28,11 @@ base::string16 GetLocalizedSignOutStringForStatus(LoginStatus status,
message_id = IDS_ASH_STATUS_TRAY_EXIT_PUBLIC;
break;
default:
- message_id = IDS_ASH_STATUS_TRAY_SIGN_OUT;
+ if (1 < ash::Shell::GetInstance()->session_state_delegate()->
James Cook 2013/05/17 14:03:25 nit: chromium-style prefers "foo == 1" to "1 == fo
Mr4D (OOO till 08-26) 2013/05/17 16:26:40 Done.
+ NumberOfLoggedInUsers())
+ message_id = IDS_ASH_STATUS_TRAY_SIGN_OUT_ALL;
+ else
+ message_id = IDS_ASH_STATUS_TRAY_SIGN_OUT;
break;
}
base::string16 message =

Powered by Google App Engine
This is Rietveld 408576698