diff options
| author | tmdiep@chromium.org <tmdiep@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-04 16:52:32 +0000 |
|---|---|---|
| committer | tmdiep@chromium.org <tmdiep@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-04 16:52:32 +0000 |
| commit | 44c1357d307979826a9bf26fa6a2b2b71b460df6 (patch) | |
| tree | a2eb52feb81eb210255b062bd0ce881453618de4 /ash/shell/app_list.cc | |
| parent | 0ff9929956b5b29611cba098a7eab266a5acc185 (diff) | |
| download | chromium_src-44c1357d307979826a9bf26fa6a2b2b71b460df6.zip chromium_src-44c1357d307979826a9bf26fa6a2b2b71b460df6.tar.gz chromium_src-44c1357d307979826a9bf26fa6a2b2b71b460df6.tar.bz2 | |
Display an app's short name in the app launcher
The app launcher will now display an app's short name (the new
short_name property in the manifest file). If an app's short name
and full name differ, the tooltip will show the full name. If an
app's short name and full name are identical, a tooltip will only
be shown if the title is truncated.
BUG=226848
TEST=If an app has a short name and it differs from its full name,
a tooltip should always be shown, displaying the full name. If an
app does not have a short name override, there should be no change
in behavior, i.e. a tooltip will only be shown if the title is
truncated.
Review URL: https://chromiumcodereview.appspot.com/23709003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221205 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell/app_list.cc')
| -rw-r--r-- | ash/shell/app_list.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc index 498de37..1497458 100644 --- a/ash/shell/app_list.cc +++ b/ash/shell/app_list.cc @@ -45,8 +45,9 @@ class WindowTypeLauncherItem : public app_list::AppListItemModel { }; explicit WindowTypeLauncherItem(Type type) : type_(type) { + std::string title(GetTitle(type)); SetIcon(GetIcon(type), false); - SetTitle(GetTitle(type)); + SetTitleAndFullName(title, title); } static gfx::ImageSkia GetIcon(Type type) { |