Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1435)

Unified Diff: ash/shelf/app_list_shelf_item_delegate.cc

Issue 853643002: App list: Changed launcher button's tooltip to "Launcher" in Ares mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed SpokenFeedbackTest. Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shelf/app_list_button.cc ('k') | chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(
« no previous file with comments | « ash/shelf/app_list_button.cc ('k') | chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698