[Views] Set the width of the Website Settings UI dynamically.

chrome/browser/ui/views/website_settings/website_settings_popup_view.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/website_settings/website_settings_popup_view.h"
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
@@ skipping 79 matching lines @@
 const int kPermissionsSectionPaddingLeft = 18;
 const int kPermissionsSectionPaddingTop = 16;
 // Space between the headline and the content of a section on the permissions
 // tab.
 const int kPermissionsSectionHeadlineMarginBottom = 10;
 // The content of the "Permissions" section and the "Cookies and Site Data"
 // section is structured in individual rows. |kPermissionsSectionRowSpacing|
 // is the space between these rows.
 const int kPermissionsSectionRowSpacing = 2;
 
-// The max width of the popup.
-const int kPopupWidth = 310;
+// The min width of the popup.
+const int kMinPopupWidth = 310;
 
 const int kSiteDataIconColumnWidth = 20;
 const int kSiteDataSectionRowSpacing = 11;
 
 }  // namespace
 
 // |PopupHeaderView| is the UI element (view) that represents the header of the
 // |WebsiteSettingsPopupView|. The header shows the status of the site's
 // identity check and the name of the site's identity.
 class PopupHeaderView : public views::View {
@@ skipping 287 matching lines @@
 
 gfx::Size WebsiteSettingsPopupView::GetPreferredSize() {
   if (header_ == NULL && tabbed_pane_ == NULL)
     return views::View::GetPreferredSize();
 
   int height = 0;
   if (header_)
     height += header_->GetPreferredSize().height();
   if (tabbed_pane_)
     height += tabbed_pane_->GetPreferredSize().height();
-  return gfx::Size(kPopupWidth, height);
+
+  int width = kMinPopupWidth - kPermissionsSectionPaddingLeft;

[msw, 2012/11/07 22:43:08]

nit: replace kMinPopupWidth with a kMinContentWidth that doesn't have this
padding value built-in to simplify.

[markusheintz_, 2012/11/08 16:38:47]

Done.

+  if (site_data_content_ &&
+      width < site_data_content_->GetPreferredSize().width()) {
+    width = site_data_content_->GetPreferredSize().width();

[msw, 2012/11/07 22:43:08]

nit: nix the width comparison and do std::max here and below.

[markusheintz_, 2012/11/08 16:38:47]

Done.

+  }
+  if (permissions_content_ &&
+      width < permissions_content_->GetPreferredSize().width()) {
+    width = permissions_content_->GetPreferredSize().width();
+  }
+  width += kPermissionsSectionPaddingLeft;
+
+  return gfx::Size(width, height);
 }
 
 void WebsiteSettingsPopupView::SetCookieInfo(
     const CookieInfoList& cookie_info_list) {
   site_data_content_->RemoveAllChildViews(true);
 
   views::GridLayout* layout = new views::GridLayout(site_data_content_);
   site_data_content_->SetLayoutManager(layout);
 
   const int site_data_content_column = 0;
@@ skipping 317 matching lines @@
 
   if (link) {
     content_layout->StartRow(1, 0);
     content_layout->AddView(link);
   }
 
   layout->AddView(content_pane, 1, 1, views::GridLayout::LEADING,
                   views::GridLayout::LEADING);
   layout->AddPaddingRow(0, kConnectionSectionPaddingBottom);
 }