Commit 93748d64 authored by tfarina@chromium.org's avatar tfarina@chromium.org

ash: Rename some IDS_AURA entries to IDS_ASH_SHELF.

This is because the directory was aura before it was renamed to ash.

BUG=248353
R=jamescook@chromium.org

Review URL: https://codereview.chromium.org/282163004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271221 0039d316-1c4b-4281-b951-d872f2087c98
parent b4c0aec4
...@@ -164,10 +164,10 @@ This file contains the strings for ash. ...@@ -164,10 +164,10 @@ This file contains the strings for ash.
<ph> element). You can also use the 'grit add' tool to help you identify <ph> element). You can also use the 'grit add' tool to help you identify
nontranslateable parts and create placeholders for them. --> nontranslateable parts and create placeholders for them. -->
<!-- TODO(zork): Only include these in Aura builds --> <!-- TODO(zork): Only include these in Aura builds -->
<message name="IDS_AURA_APP_LIST_TITLE" desc="The title used for the Aura app list in the launcher"> <message name="IDS_ASH_SHELF_APP_LIST_TITLE" desc="The title used for the Ash App List in the Shelf">
Apps Apps
</message> </message>
<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."> <message name="IDS_ASH_SHELF_APP_LIST_SYNCING_TITLE" desc="The title used for the Ash App List in the Shelf to indicate loading/syncing apps.">
Syncing apps... Syncing apps...
</message> </message>
<message name="IDS_ASH_SHELF_OVERFLOW_NAME" desc="The title used for the Ash overflow button in the shelf"> <message name="IDS_ASH_SHELF_OVERFLOW_NAME" desc="The title used for the Ash overflow button in the shelf">
......
...@@ -37,7 +37,7 @@ AlternateAppListButton::AlternateAppListButton(views::ButtonListener* listener, ...@@ -37,7 +37,7 @@ AlternateAppListButton::AlternateAppListButton(views::ButtonListener* listener,
: views::ImageButton(listener), : views::ImageButton(listener),
host_(host), host_(host),
shelf_widget_(shelf_widget) { shelf_widget_(shelf_widget) {
SetAccessibleName(l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE)); SetAccessibleName(l10n_util::GetStringUTF16(IDS_ASH_SHELF_APP_LIST_TITLE));
SetSize(gfx::Size(ShelfLayoutManager::kShelfSize, SetSize(gfx::Size(ShelfLayoutManager::kShelfSize,
ShelfLayoutManager::kShelfSize)); ShelfLayoutManager::kShelfSize));
SetFocusPainter(views::Painter::CreateSolidFocusPainter( SetFocusPainter(views::Painter::CreateSolidFocusPainter(
......
...@@ -37,7 +37,7 @@ AppListButton::AppListButton(views::ButtonListener* listener, ...@@ -37,7 +37,7 @@ AppListButton::AppListButton(views::ButtonListener* listener,
: views::ImageButton(listener), : views::ImageButton(listener),
host_(host), host_(host),
shelf_widget_(shelf_widget) { shelf_widget_(shelf_widget) {
SetAccessibleName(l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE)); SetAccessibleName(l10n_util::GetStringUTF16(IDS_ASH_SHELF_APP_LIST_TITLE));
SetSize(gfx::Size(kShelfSize, kShelfSize)); SetSize(gfx::Size(kShelfSize, kShelfSize));
SetFocusPainter(views::Painter::CreateSolidFocusPainter( SetFocusPainter(views::Painter::CreateSolidFocusPainter(
kFocusBorderColor, gfx::Insets(1, 1, 1, 1))); kFocusBorderColor, gfx::Insets(1, 1, 1, 1)));
......
...@@ -32,8 +32,8 @@ base::string16 AppListShelfItemDelegate::GetTitle() { ...@@ -32,8 +32,8 @@ base::string16 AppListShelfItemDelegate::GetTitle() {
ShelfModel* model = Shell::GetInstance()->shelf_model(); ShelfModel* model = Shell::GetInstance()->shelf_model();
DCHECK(model); DCHECK(model);
return model->status() == ShelfModel::STATUS_LOADING ? return model->status() == ShelfModel::STATUS_LOADING ?
l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_SYNCING_TITLE) : l10n_util::GetStringUTF16(IDS_ASH_SHELF_APP_LIST_SYNCING_TITLE) :
l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE); l10n_util::GetStringUTF16(IDS_ASH_SHELF_APP_LIST_TITLE);
} }
ui::MenuModel* AppListShelfItemDelegate::CreateContextMenu( ui::MenuModel* AppListShelfItemDelegate::CreateContextMenu(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment