ash: Rename "Autohide launcher" item.

This patch renames:
- "Autohide launcher" to "Autohide shelf"
- "Launcher position" to "Shelf position".

BUG=263531
TEST=out_cros/Debug/chrome --disable-setuid-sandbox --ash-use-alternate-shelf --show-launcher-alignment-menu
R=jamescook@chromium.org,sky@chromium.org

Review URL: https://chromiumcodereview.appspot.com/22007003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215808 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 20 insertions, 25 deletions

diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd
index 1334f17..f43ba86 100644
--- a/ash/ash_strings.grd
+++ b/ash/ash_strings.grd
@@ -170,26 +170,26 @@ This file contains the strings for ash.
       <message name="IDS_AURA_APP_LIST_SYNCING_TITLE" desc="The title used for the Aura app list in the launcher to indicate loading/syncing apps.">
         Syncing apps...
       </message>
-      <message name="IDS_AURA_LAUNCHER_OVERFLOW_NAME" desc="The title used for the Aura overflow button in the launcher">
+      <message name="IDS_ASH_SHELF_OVERFLOW_NAME" desc="The title used for the Ash overflow button in the shelf">
         Overflow Button
       </message>
-      <message name="IDS_AURA_LAUNCHER_CONTEXT_MENU_AUTO_HIDE" desc="Title of the menu item in the context menu for auto-hiding the launcher when the current window is not maximized">
-        Autohide launcher
+      <message name="IDS_ASH_SHELF_CONTEXT_MENU_AUTO_HIDE" desc="Title of the menu item in the context menu for auto-hiding the shelf when the current window is not maximized">
+        Autohide shelf
       </message>
-      <message name="IDS_AURA_LAUNCHER_CONTEXT_MENU_POSITION" desc="Title of the menu item in the context menu for aligning the launcher">
-        Launcher position
+      <message name="IDS_ASH_SHELF_CONTEXT_MENU_POSITION" desc="Title of the menu item in the context menu for aligning the shelf">
+        Shelf position
       </message>
-      <message name="IDS_AURA_LAUNCHER_CONTEXT_MENU_ALIGN_BOTTOM" desc="Title of the menu item in the context menu for aligning the launcher to the bottom of the screen">
+      <message name="IDS_ASH_SHELF_CONTEXT_MENU_ALIGN_BOTTOM" desc="Title of the menu item in the context menu for aligning the shelf to the bottom of the screen">
         Bottom
       </message>
-      <message name="IDS_AURA_LAUNCHER_CONTEXT_MENU_ALIGN_LEFT" desc="Title of the menu item in the context menu for aligning the launcher to the left of the screen">
+      <message name="IDS_ASH_SHELF_CONTEXT_MENU_ALIGN_LEFT" desc="Title of the menu item in the context menu for aligning the shelf to the left of the screen">
         Left
       </message>
-      <message name="IDS_AURA_LAUNCHER_CONTEXT_MENU_ALIGN_RIGHT" desc="Title of the menu item in the context menu for aligning the launcher to the right of the screen">
+      <message name="IDS_ASH_SHELF_CONTEXT_MENU_ALIGN_RIGHT" desc="Title of the menu item in the context menu for aligning the shelf to the right of the screen">
         Right
       </message>
-      <message name="IDS_ASH_LAUNCHER_ACCESSIBLE_NAME" desc="The accessible name of the launcher.">
-        Launcher
+      <message name="IDS_ASH_SHELF_ACCESSIBLE_NAME" desc="The accessible name of the shelf.">
+        Shelf
       </message>
 
       <message name="IDS_AURA_SET_DESKTOP_WALLPAPER" desc="The label used for change wallpaper in context menu">
diff --git a/ash/launcher/launcher_alignment_menu.cc b/ash/launcher/launcher_alignment_menu.cc
index 13a92bc..8d6b6cf 100644
--- a/ash/launcher/launcher_alignment_menu.cc
+++ b/ash/launcher/launcher_alignment_menu.cc
@@ -13,26 +13,24 @@
 
 namespace ash {
 
-LauncherAlignmentMenu::LauncherAlignmentMenu(
-    aura::RootWindow* root)
+LauncherAlignmentMenu::LauncherAlignmentMenu(aura::RootWindow* root)
     : ui::SimpleMenuModel(NULL),
       root_window_(root) {
   DCHECK(root_window_);
   int align_group_id = 1;
   set_delegate(this);
   AddRadioItemWithStringId(MENU_ALIGN_LEFT,
-                           IDS_AURA_LAUNCHER_CONTEXT_MENU_ALIGN_LEFT,
+                           IDS_ASH_SHELF_CONTEXT_MENU_ALIGN_LEFT,
                            align_group_id);
   AddRadioItemWithStringId(MENU_ALIGN_BOTTOM,
-                           IDS_AURA_LAUNCHER_CONTEXT_MENU_ALIGN_BOTTOM,
+                           IDS_ASH_SHELF_CONTEXT_MENU_ALIGN_BOTTOM,
                            align_group_id);
   AddRadioItemWithStringId(MENU_ALIGN_RIGHT,
-                           IDS_AURA_LAUNCHER_CONTEXT_MENU_ALIGN_RIGHT,
+                           IDS_ASH_SHELF_CONTEXT_MENU_ALIGN_RIGHT,
                            align_group_id);
 }
 
-LauncherAlignmentMenu::~LauncherAlignmentMenu() {
-}
+LauncherAlignmentMenu::~LauncherAlignmentMenu() {}
 
 bool LauncherAlignmentMenu::IsCommandIdChecked(int command_id) const {
   return internal::ShelfLayoutManager::ForLauncher(root_window_)->
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc
index 015ba3f..ea027f6 100644
--- a/ash/launcher/launcher_view.cc
+++ b/ash/launcher/launcher_view.cc
@@ -1234,7 +1234,7 @@ views::FocusTraversable* LauncherView::GetPaneFocusTraversable() {
 
 void LauncherView::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_TOOLBAR;
-  state->name = l10n_util::GetStringUTF16(IDS_ASH_LAUNCHER_ACCESSIBLE_NAME);
+  state->name = l10n_util::GetStringUTF16(IDS_ASH_SHELF_ACCESSIBLE_NAME);
 }
 
 void LauncherView::OnGestureEvent(ui::GestureEvent* event) {
diff --git a/ash/launcher/overflow_button.cc b/ash/launcher/overflow_button.cc
index 1a4ad3a..8847468 100644
--- a/ash/launcher/overflow_button.cc
+++ b/ash/launcher/overflow_button.cc
@@ -55,13 +55,10 @@ OverflowButton::OverflowButton(views::ButtonListener* listener)
   image_ = rb.GetImageNamed(IDR_AURA_LAUNCHER_OVERFLOW).ToImageSkia();
 
   set_accessibility_focusable(true);
-  SetAccessibleName(
-      l10n_util::GetStringUTF16(IDS_AURA_LAUNCHER_OVERFLOW_NAME));
+  SetAccessibleName(l10n_util::GetStringUTF16(IDS_ASH_SHELF_OVERFLOW_NAME));
 }
 
-
-OverflowButton::~OverflowButton() {
-}
+OverflowButton::~OverflowButton() {}
 
 void OverflowButton::OnShelfAlignmentChanged() {
   SchedulePaint();
diff --git a/ash/shell/context_menu.cc b/ash/shell/context_menu.cc
index bb70e7c..e1a62d1 100644
--- a/ash/shell/context_menu.cc
+++ b/ash/shell/context_menu.cc
@@ -21,9 +21,9 @@ ContextMenu::ContextMenu(aura::RootWindow* root)
   DCHECK(root_window_);
   set_delegate(this);
   AddCheckItemWithStringId(MENU_AUTO_HIDE,
-                           IDS_AURA_LAUNCHER_CONTEXT_MENU_AUTO_HIDE);
+                           IDS_ASH_SHELF_CONTEXT_MENU_AUTO_HIDE);
   AddSubMenuWithStringId(MENU_ALIGNMENT_MENU,
-                         IDS_AURA_LAUNCHER_CONTEXT_MENU_POSITION,
+                         IDS_ASH_SHELF_CONTEXT_MENU_POSITION,
                          &alignment_menu_);
 }