Update strings in user menu

The following strings in the user menu
are updated:
 - "Guest" -> "Open Guest window"
 - "Close all your windows" -> "Exit <Profile>",
   in case there are multiple profiles
 - "Close all your windows": titlecase added

Bug: 836066, 130656
Change-Id: I526db685f3efd0c7b8623ab8a0081b9414ceed94
Reviewed-on: https://chromium-review.googlesource.com/1025758
Commit-Queue: Thomas Tangl <tangltom@chromium.org>
Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553503}

chrome/app/generated_resources.grd

@@ -7358,8 +7358,8 @@ I don't think this site should be blocked!
       <message name="IDS_PROFILES_PROFILE_SIGNOUT_BUTTON" desc="Button in the avatar menu bubble view to sign-out the current profile.">
         Exit and childlock
       </message>
-      <message name="IDS_PROFILES_CLOSE_ALL_WINDOWS_BUTTON" desc="Button in the avatar menu bubble view to close all windows of the current profile.">
-        Close all your windows
+      <message name="IDS_PROFILES_EXIT_PROFILE_BUTTON" desc="Button in the avatar menu bubble view to close all windows of the current profile when there is more than one profile.">
+        Exit <ph name="PROFILE_NAME">$1<ex>User</ex></ph>
       </message>
       <message name="IDS_PROFILES_GAIA_SIGNIN_TITLE" desc="Title of the account removal view in the avatar menu bubble.">
         Sign in
@@ -7440,6 +7440,12 @@ I don't think this site should be blocked!
         <message name="IDS_PROFILES_MANAGE_USERS_BUTTON" desc="Button in the avatar menu bubble view for launching the user manager.">
           Manage people
         </message>
+        <message name="IDS_PROFILES_OPEN_GUEST_PROFILE_BUTTON" desc="Button in the avatar menu bubble view to open a guest window.">
+          Open Guest window
+        </message>
+        <message name="IDS_PROFILES_CLOSE_ALL_WINDOWS_BUTTON" desc="Button in the avatar menu bubble view to close all windows of the current profile.">
+          Close all your windows
+        </message>
       </if>
       <if expr="use_titlecase">
         <message name="IDS_PROFILES_PROFILE_ADD_ACCOUNT_BUTTON" desc="Button in the avatar menu bubble view used to add an account to a profile.">
@@ -7463,6 +7469,12 @@ I don't think this site should be blocked!
         <message name="IDS_PROFILES_MANAGE_USERS_BUTTON" desc="Button in the avatar menu bubble view for launching the user manager.">
           Manage People
         </message>
+        <message name="IDS_PROFILES_OPEN_GUEST_PROFILE_BUTTON" desc="Button in the avatar menu bubble view to open a guest window.">
+          Open Guest Window
+        </message>
+        <message name="IDS_PROFILES_CLOSE_ALL_WINDOWS_BUTTON" desc="Button in the avatar menu bubble view to close all windows of the current profile.">
+          Close all your Windows
+        </message>
       </if>
       <message name="IDS_PROFILES_EDIT_PROFILE_ACCESSIBLE_NAME" desc="Description of the Edit Profile button. This is used for accessibility.">
         Edit person, <ph name="PROFILE_NAME">$1<ex>Jane Doe</ex></ph>

chrome/browser/ui/views/profiles/profile_chooser_view.cc

@@ -1222,11 +1222,11 @@ views::View* ProfileChooserView::CreateOptionsView(bool display_lock,
     PrefService* service = g_browser_process->local_state();
     DCHECK(service);
     if (service->GetBoolean(prefs::kBrowserGuestModeEnabled)) {
-      guest_profile_button_ =
-          new HoverButton(this,
-                          gfx::CreateVectorIcon(kUserMenuGuestIcon, kIconSize,
-                                                gfx::kChromeIconGrey),
-                          l10n_util::GetStringUTF16(IDS_GUEST_PROFILE_NAME));
+      guest_profile_button_ = new HoverButton(
+          this,
+          gfx::CreateVectorIcon(kUserMenuGuestIcon, kIconSize,
+                                gfx::kChromeIconGrey),
+          l10n_util::GetStringUTF16(IDS_PROFILES_OPEN_GUEST_PROFILE_BUTTON));
       layout->StartRow(1, 0);
       layout->AddView(guest_profile_button_);
     }
@@ -1253,10 +1253,15 @@ views::View* ProfileChooserView::CreateOptionsView(bool display_lock,
     layout->StartRow(1, 0);
     layout->AddView(lock_button_);
   } else if (!is_guest) {
+    AvatarMenu::Item active_avatar_item =
+        avatar_menu->GetItemAt(ordered_item_indices[0]);
     close_all_windows_button_ = new HoverButton(
         this,
         gfx::CreateVectorIcon(kCloseAllIcon, kIconSize, gfx::kChromeIconGrey),
-        l10n_util::GetStringUTF16(IDS_PROFILES_CLOSE_ALL_WINDOWS_BUTTON));
+        avatar_menu->GetNumberOfItems() >= 2
+            ? l10n_util::GetStringFUTF16(IDS_PROFILES_EXIT_PROFILE_BUTTON,
+                                         active_avatar_item.name)
+            : l10n_util::GetStringUTF16(IDS_PROFILES_CLOSE_ALL_WINDOWS_BUTTON));
     layout->StartRow(1, 0);
     layout->AddView(close_all_windows_button_);
   }