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

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

Issue 2750063002: views: implement dialog width snapping (Closed)
Patch Set: remove stray logging Created 3 years, 9 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: 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 6d0ade5ffe0f0cbbf4fa4092130fd9b44a1151a0..b2e674735353fc55950e9d3c8bababd6e70d37fe 100644
--- a/chrome/browser/ui/views/content_setting_bubble_contents.cc
+++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc
@@ -186,16 +186,11 @@ ContentSettingBubbleContents::~ContentSettingBubbleContents() {
gfx::Size ContentSettingBubbleContents::GetPreferredSize() const {
gfx::Size preferred_size(views::View::GetPreferredSize());
- int preferred_width = LayoutDelegate::Get()->GetDialogPreferredWidth(
- LayoutDelegate::DialogWidth::SMALL);
- if (!preferred_width)
- preferred_width = (!content_setting_bubble_model_->bubble_content()
- .domain_lists.empty() &&
- (kMinMultiLineContentsWidth > preferred_size.width()))
- ? kMinMultiLineContentsWidth
- : preferred_size.width();
- else
- preferred_width -= margins().width();
+ int preferred_width =
+ (!content_setting_bubble_model_->bubble_content().domain_lists.empty() &&
+ (kMinMultiLineContentsWidth > preferred_size.width()))
+ ? kMinMultiLineContentsWidth
+ : preferred_size.width();
if (content_setting_bubble_model_->AsSubresourceFilterBubbleModel()) {
preferred_size.set_width(std::min(preferred_width,
kMaxDefaultContentsWidth));

Powered by Google App Engine
This is Rietveld 408576698