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

ash/system/user/login_status.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace ash {
 namespace user {
 
 base::string16 GetLocalizedSignOutStringForStatus(LoginStatus status,
                                                   bool multiline) {
   int message_id;
   switch (status) {
     case LOGGED_IN_GUEST:
       message_id = IDS_ASH_STATUS_TRAY_EXIT_GUEST;
       break;
     case LOGGED_IN_RETAIL_MODE:
       message_id = IDS_ASH_STATUS_TRAY_EXIT_KIOSK;
       break;
     case LOGGED_IN_PUBLIC:
       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 == foo", so I would suggest
"NumberOfLoggedInUsers() > 1"

http://www.chromium.org/developers/coding-style#Code_Formatting

[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 =
       ui::ResourceBundle::GetSharedInstance().GetLocalizedString(message_id);
   // Desirable line breaking points are marked using \n. As the resource
   // framework does not evaluate escape sequences, the \n need to be explicitly
   // handled. Depending on the value of |multiline|, actual line breaks or
   // spaces are substituted.
   base::string16 newline = multiline ? ASCIIToUTF16("\n") : ASCIIToUTF16(" ");
   ReplaceSubstringsAfterOffset(&message, 0, ASCIIToUTF16("\\n"), newline);
   return message;
 }
 
 }  // namespace user
 }  // namespace ash