diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-17 16:06:06 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-17 16:06:06 +0000 |
| commit | 93748d64955b60c0c75ababddb8be26823452cb7 (patch) | |
| tree | 7ebd19e5e41c4dbec1e14bf299121299a2e6044d /ash | |
| parent | b4c0aec4c9d857c7a5d0ae46daf531919544e84f (diff) | |
| download | chromium_src-93748d64955b60c0c75ababddb8be26823452cb7.zip chromium_src-93748d64955b60c0c75ababddb8be26823452cb7.tar.gz chromium_src-93748d64955b60c0c75ababddb8be26823452cb7.tar.bz2 | |
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
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/ash_strings.grd | 4 | ||||
| -rw-r--r-- | ash/shelf/alternate_app_list_button.cc | 2 | ||||
| -rw-r--r-- | ash/shelf/app_list_button.cc | 2 | ||||
| -rw-r--r-- | ash/shelf/app_list_shelf_item_delegate.cc | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd index 0f71225..950ba14 100644 --- a/ash/ash_strings.grd +++ b/ash/ash_strings.grd @@ -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 nontranslateable parts and create placeholders for them. --> <!-- 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 </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... </message> <message name="IDS_ASH_SHELF_OVERFLOW_NAME" desc="The title used for the Ash overflow button in the shelf"> diff --git a/ash/shelf/alternate_app_list_button.cc b/ash/shelf/alternate_app_list_button.cc index 95f4445..247f506 100644 --- a/ash/shelf/alternate_app_list_button.cc +++ b/ash/shelf/alternate_app_list_button.cc @@ -37,7 +37,7 @@ AlternateAppListButton::AlternateAppListButton(views::ButtonListener* listener, : views::ImageButton(listener), host_(host), 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, ShelfLayoutManager::kShelfSize)); SetFocusPainter(views::Painter::CreateSolidFocusPainter( diff --git a/ash/shelf/app_list_button.cc b/ash/shelf/app_list_button.cc index d1246c8..9ba8332 100644 --- a/ash/shelf/app_list_button.cc +++ b/ash/shelf/app_list_button.cc @@ -37,7 +37,7 @@ AppListButton::AppListButton(views::ButtonListener* listener, : views::ImageButton(listener), host_(host), 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)); SetFocusPainter(views::Painter::CreateSolidFocusPainter( kFocusBorderColor, gfx::Insets(1, 1, 1, 1))); diff --git a/ash/shelf/app_list_shelf_item_delegate.cc b/ash/shelf/app_list_shelf_item_delegate.cc index 4261027..71e0007 100644 --- a/ash/shelf/app_list_shelf_item_delegate.cc +++ b/ash/shelf/app_list_shelf_item_delegate.cc @@ -32,8 +32,8 @@ base::string16 AppListShelfItemDelegate::GetTitle() { ShelfModel* model = Shell::GetInstance()->shelf_model(); DCHECK(model); return model->status() == ShelfModel::STATUS_LOADING ? - l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_SYNCING_TITLE) : - l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE); + l10n_util::GetStringUTF16(IDS_ASH_SHELF_APP_LIST_SYNCING_TITLE) : + l10n_util::GetStringUTF16(IDS_ASH_SHELF_APP_LIST_TITLE); } ui::MenuModel* AppListShelfItemDelegate::CreateContextMenu( |