Adding new user menu section to the SystemTrayMenu & refactoring of user access

ash/system/user/login_status.cc

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..acaaf08ee807c035787c3f2d510d53f037ab6345 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,12 @@ base::string16 GetLocalizedSignOutStringForStatus(LoginStatus status,
       message_id = IDS_ASH_STATUS_TRAY_EXIT_PUBLIC;
       break;
     default:
-      message_id = IDS_ASH_STATUS_TRAY_SIGN_OUT;
+      if (ash::Shell::GetInstance()->session_state_delegate()->
+              NumberOfLoggedInUsers() > 1) {
+        message_id = IDS_ASH_STATUS_TRAY_SIGN_OUT_ALL;
+      } else {
+        message_id = IDS_ASH_STATUS_TRAY_SIGN_OUT;
+      }
       break;
   }
   base::string16 message =