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

Unified Diff: chrome/browser/ui/views/content_setting_bubble_contents.cc

Issue 1755313004: Views - Fix text elision in content settings bubble's faux combobox (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2661
Patch Set: Created 4 years, 10 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/content_setting_bubble_contents.cc
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc
index 23ac74068b187bf538414a2dada1cd89c4042bbf..0c1e0292c55aa0bb3a5fdbb88e1a1179baa6ea38 100644
--- a/chrome/browser/ui/views/content_setting_bubble_contents.cc
+++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc
@@ -156,8 +156,9 @@ gfx::Size ContentSettingBubbleContents::GetPreferredSize() const {
gfx::Size preferred_size(views::View::GetPreferredSize());
int preferred_width =
(!content_setting_bubble_model_->bubble_content().domain_lists.empty() &&
- (kMinMultiLineContentsWidth > preferred_size.width())) ?
- kMinMultiLineContentsWidth : preferred_size.width();
+ (kMinMultiLineContentsWidth > preferred_size.width()))
+ ? kMinMultiLineContentsWidth
+ : preferred_size.width();
preferred_size.set_width(std::min(preferred_width, kMaxContentsWidth));
return preferred_size;
}
@@ -169,6 +170,7 @@ void ContentSettingBubbleContents::UpdateMenuLabel(
it != media_menus_.end(); ++it) {
if (it->second->type == type) {
it->first->SetText(base::UTF8ToUTF16(label));
+ it->first->Layout();
return;
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698