views: implement width snapping for DialogDelegateViews

chrome/browser/ui/views/content_setting_bubble_contents.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/content_setting_bubble_contents.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 166 matching lines @@
   set_anchor_view_insets(gfx::Insets(
       GetLayoutConstant(LOCATION_BAR_BUBBLE_ANCHOR_VERTICAL_INSET), 0));
 }
 
 ContentSettingBubbleContents::~ContentSettingBubbleContents() {
   // Must remove the children here so the comboboxes get destroyed before
   // their associated models.
   RemoveAllChildViews(true);
 }
 
-gfx::Size ContentSettingBubbleContents::GetPreferredSize() const {
+gfx::Size ContentSettingBubbleContents::GetUnsnappedPreferredSize() 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));
   } else {
     preferred_size.set_width(std::min(preferred_width, kMaxContentsWidth));
   }

[Peter Kasting, 2017/03/30 00:35:34]

Ugh.  This is all a mess.  Can you add a TODO here referencing bug 649650, to do
this clamping more correctly?

   return preferred_size;
 }
 
 void ContentSettingBubbleContents::Init() {
   using views::GridLayout;
 
   GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
   const LayoutDelegate* layout_delegate = LayoutDelegate::Get();
   const int related_control_horizontal_spacing = layout_delegate->GetMetric(
@@ skipping 292 matching lines @@
   DCHECK(i != list_item_links_.end());
   content_setting_bubble_model_->OnListItemClicked(i->second);
 }
 
 void ContentSettingBubbleContents::OnPerformAction(views::Combobox* combobox) {
   MediaComboboxModel* model =
       static_cast<MediaComboboxModel*>(combobox->model());
   content_setting_bubble_model_->OnMediaMenuClicked(
       model->type(), model->GetDevices()[combobox->selected_index()].id);
 }