chrome/browser/ui/views/location_bar/origin_chip_view.cc - Issue 312233003: Add fade eliding for Views Labels; related cleanup.

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: chrome/browser/ui/views/location_bar/origin_chip_view.cc

Issue 312233003: Add fade eliding for Views Labels; related cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Refine alignment check; minor additional cleanup. Created 6 years, 6 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:

Index: chrome/browser/ui/views/location_bar/origin_chip_view.cc

diff --git a/chrome/browser/ui/views/location_bar/origin_chip_view.cc b/chrome/browser/ui/views/location_bar/origin_chip_view.cc

index e8b4d668acec73d5b0628a66b6dea4162f744dcc..1e41a8d25b0b4a2db75397d5261d63c2a45d4ca8 100644

--- a/chrome/browser/ui/views/location_bar/origin_chip_view.cc

+++ b/chrome/browser/ui/views/location_bar/origin_chip_view.cc

@@ -164,12 +164,12 @@ OriginChipView::OriginChipView(LocationBarView* location_bar_view,

ev_label_ = new views::Label(base::string16(), GetFontList());

ev_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);

- ev_label_->SetElideBehavior(views::Label::NO_ELIDE);

+ ev_label_->SetElideBehavior(gfx::TRUNCATE);

AddChildView(ev_label_);

host_label_ = new views::Label(base::string16(), GetFontList());

host_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);

- host_label_->SetElideBehavior(views::Label::NO_ELIDE);

+ host_label_->SetElideBehavior(gfx::TRUNCATE);

AddChildView(host_label_);

fade_in_animation_.SetTweenType(gfx::Tween::LINEAR_OUT_SLOW_IN);