| Index: ash/shelf/app_list_shelf_item_delegate.cc
|
| diff --git a/ash/shelf/app_list_shelf_item_delegate.cc b/ash/shelf/app_list_shelf_item_delegate.cc
|
| index 71e0007b817d083eece1d348ee3d3bc262c60785..99c58e1eecbe4588dd33602065af819b34d99f1d 100644
|
| --- a/ash/shelf/app_list_shelf_item_delegate.cc
|
| +++ b/ash/shelf/app_list_shelf_item_delegate.cc
|
| @@ -8,6 +8,7 @@
|
| #include "ash/shell.h"
|
| #include "ash/shell_delegate.h"
|
| #include "grit/ash_strings.h"
|
| +#include "ui/app_list/app_list_switches.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
|
|
| namespace ash {
|
| @@ -31,9 +32,17 @@ bool AppListShelfItemDelegate::ItemSelected(const ui::Event& event) {
|
| base::string16 AppListShelfItemDelegate::GetTitle() {
|
| ShelfModel* model = Shell::GetInstance()->shelf_model();
|
| DCHECK(model);
|
| - return model->status() == ShelfModel::STATUS_LOADING ?
|
| - l10n_util::GetStringUTF16(IDS_ASH_SHELF_APP_LIST_SYNCING_TITLE) :
|
| - l10n_util::GetStringUTF16(IDS_ASH_SHELF_APP_LIST_TITLE);
|
| + 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;
|
| + }
|
| + return l10n_util::GetStringUTF16(title_id);
|
| }
|
|
|
| ui::MenuModel* AppListShelfItemDelegate::CreateContextMenu(
|
|
|