Restrict width of the Subresource Filtering bubble to 320px.

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 29 matching lines @@
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/native_cursor.h"
 
 namespace {
 
 // If we don't clamp the maximum width, then very long URLs and titles can make
 // the bubble arbitrarily wide.
 const int kMaxContentsWidth = 500;

[msw, 2016/09/15 18:29:03]

Should we just change the existing maximum width? Please work with someone to
consider the behavior of this bubble in the context of all the other content
setting bubbles. This bubble probably shouldn't get a lot of unique treatments
(link->button, special width, etc.).

 
 // When we have multiline labels, we should set a minimum width lest we get very
 // narrow bubbles with lots of line-wrapping.
 const int kMinMultiLineContentsWidth = 250;
 
+// Subresource filter bubble has ling explanation string, so the width should be

[msw, 2016/09/15 18:29:03]

nit: 'a long' consider: 'Maximum width of the subresource filter prompt, which
has a long string.'

[melandory, 2016/09/15 19:47:43]

Done.

+// bounded.
+const int kMaxSubresourceFilterPromptWidth = 320;
+
 }  // namespace
 
 using content::PluginService;
 using content::WebContents;
 
 // ContentSettingBubbleContents::MediaComboboxModel ----------------------------
 
 ContentSettingBubbleContents::MediaComboboxModel::MediaComboboxModel(
     content::MediaStreamType type)
     : type_(type) {
@@ skipping 109 matching lines @@
   RemoveAllChildViews(true);
 }
 
 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();
-  preferred_size.set_width(std::min(preferred_width, kMaxContentsWidth));
+  preferred_size.set_width(

[msw, 2016/09/15 18:29:03]

nit: consider:
  preferred_size.set_width(std::min(preferred_width, kMaxContentsWidth));
  // Clamp the subresource filter prompt even further, because ... <insert text
explaining why this bubble should be less wide than other content bubbles, which
isn't really obvious>
  if (content_setting_bubble_model_->AsSubresourceFilterBubbleModel())
    preferred_size.set_width(std::min(preferred_width,
kMaxSubresourceFilterPromptWidth));

[melandory, 2016/09/15 19:47:43]

Done.

+      std::min(preferred_width,
+               content_setting_bubble_model_->AsSubresourceFilterBubbleModel()
+                   ? kMaxSubresourceFilterPromptWidth
+                   : kMaxContentsWidth));
   return preferred_size;
 }
 
 void ContentSettingBubbleContents::Init() {
   using views::GridLayout;
 
   GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
 
   const int kSingleColumnSetId = 0;
@@ skipping 264 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);
 }