summaryrefslogtreecommitdiffstats
path: root/ash/launcher
diff options
context:
space:
mode:
authorvarunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-09 03:23:12 +0000
committervarunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-09 03:23:12 +0000
commit5c48ab24bc795a5967aa4ce07fe8e1eda9b153c1 (patch)
tree4ae54882d1af80c6479819ee0cc4ee0841cad6ba /ash/launcher
parentaaf40ca9757a1c8baf4933c1ec598f52c9582fc7 (diff)
downloadchromium_src-5c48ab24bc795a5967aa4ce07fe8e1eda9b153c1.zip
chromium_src-5c48ab24bc795a5967aa4ce07fe8e1eda9b153c1.tar.gz
chromium_src-5c48ab24bc795a5967aa4ce07fe8e1eda9b153c1.tar.bz2
aura: Long launcher tooltips should elide at end.
BUG=133292 TEST=manual Review URL: https://chromiumcodereview.appspot.com/10834207 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150704 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/launcher')
-rw-r--r--ash/launcher/launcher_tooltip_manager.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/launcher/launcher_tooltip_manager.cc b/ash/launcher/launcher_tooltip_manager.cc
index e83407f..51b56d0 100644
--- a/ash/launcher/launcher_tooltip_manager.cc
+++ b/ash/launcher/launcher_tooltip_manager.cc
@@ -31,7 +31,7 @@ const int kTooltipTopBottomMargin = 3;
const int kTooltipLeftRightMargin = 10;
const int kTooltipAppearanceDelay = 200; // msec
const int kTooltipMinHeight = 29 - 2 * kTooltipTopBottomMargin;
-const SkColor kTooltipTextColor = SkColorSetRGB(22, 22, 22);
+const SkColor kTooltipTextColor = SkColorSetRGB(0x22, 0x22, 0x22);
// The maximum width of the tooltip bubble. Borrowed the value from
// ash/tooltip/tooltip_controller.cc
@@ -109,6 +109,7 @@ LauncherTooltipManager::LauncherTooltipBubble::LauncherTooltipBubble(
label_ = new views::Label;
label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
label_->SetEnabledColor(kTooltipTextColor);
+ label_->SetElideBehavior(views::Label::ELIDE_AT_END);
AddChildView(label_);
views::BubbleDelegateView::CreateBubble(this);
bubble_border_ = new views::BubbleBorder2(views::BubbleBorder::BOTTOM_RIGHT);