ash/shelf/app_list_button.cc - Issue 853643002: App list: Changed launcher button's tooltip to "Launcher" in Ares mode.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/shelf/app_list_button.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

Index: ash/shelf/app_list_button.cc

diff --git a/ash/shelf/app_list_button.cc b/ash/shelf/app_list_button.cc

index 922853966739974cdc4e5c3484883dbe52143c5f..259c82566e282628bdfd064d69b5f67abf5a576a 100644

--- a/ash/shelf/app_list_button.cc

+++ b/ash/shelf/app_list_button.cc

@@ -15,6 +15,7 @@

#include "grit/ash_resources.h"

#include "grit/ash_strings.h"

#include "ui/accessibility/ax_view_state.h"

+#include "ui/app_list/app_list_switches.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/base/ui_base_switches_util.h"

@@ -39,7 +40,10 @@ AppListButton::AppListButton(views::ButtonListener* listener,

draw_background_as_active_(false),

host_(host),

shelf_widget_(shelf_widget) {

- SetAccessibleName(l10n_util::GetStringUTF16(IDS_ASH_SHELF_APP_LIST_TITLE));

+ SetAccessibleName(

+ app_list::switches::IsExperimentalAppListEnabled()

+ ? l10n_util::GetStringUTF16(IDS_ASH_SHELF_APP_LIST_LAUNCHER_TITLE)

+ : 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)));

« no previous file with comments | « ash/ash_strings.grd ('k') | ash/shelf/app_list_shelf_item_delegate.cc » ('j') | no next file with comments »