| Index: ash/common/shelf/app_list_shelf_item_delegate.cc
|
| diff --git a/ash/common/shelf/app_list_shelf_item_delegate.cc b/ash/common/shelf/app_list_shelf_item_delegate.cc
|
| index 128a7e7866620bb83cb7006c282f7d418a03ea7d..93b8a10e63ff734b20437f651a85634140fc6569 100644
|
| --- a/ash/common/shelf/app_list_shelf_item_delegate.cc
|
| +++ b/ash/common/shelf/app_list_shelf_item_delegate.cc
|
| @@ -43,15 +43,9 @@ base::string16 AppListShelfItemDelegate::GetTitle() {
|
| ShelfModel* model = WmShell::Get()->shelf_model();
|
| DCHECK(model);
|
| int title_id;
|
| - if (app_list::switches::IsExperimentalAppListEnabled()) {
|
| - title_id = model->status() == ShelfModel::STATUS_LOADING
|
| - ? IDS_ASH_SHELF_APP_LIST_LAUNCHER_SYNCING_TITLE
|
| - : IDS_ASH_SHELF_APP_LIST_LAUNCHER_TITLE;
|
| - } else {
|
| - title_id = model->status() == ShelfModel::STATUS_LOADING
|
| - ? IDS_ASH_SHELF_APP_LIST_SYNCING_TITLE
|
| - : IDS_ASH_SHELF_APP_LIST_TITLE;
|
| - }
|
| + title_id = model->status() == ShelfModel::STATUS_LOADING
|
| + ? IDS_ASH_SHELF_APP_LIST_LAUNCHER_SYNCING_TITLE
|
| + : IDS_ASH_SHELF_APP_LIST_LAUNCHER_TITLE;
|
| return l10n_util::GetStringUTF16(title_id);
|
| }
|
|
|
|
|