Fix broken paddings of the WebsiteSettingsPopopView.

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/profiles/profile.h"
@@ skipping 27 matching lines @@
 #include "ui/views/controls/separator.h"
 #include "ui/views/controls/tabbed_pane/tabbed_pane.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_manager.h"
 #include "ui/views/view.h"
 
 namespace {
 
 // Padding values for sections on the connection tab.
-const int kConnectionSectionPaddingBottom = 10;
-const int kConnectionSectionPaddingLeft = 10;
-const int kConnectionSectionPaddingTop = 10;
-const int kConnectionSectionPaddingRight = 10;
-
-// In order to make the arrow of the bubble point directly at the location icon
-// in the Omnibox rather then the bottom border of the Omnibox, the position of
-// the bubble must be adjusted. This is the number of pixel the bubble must be
-// moved towards the top of the screen (starting from the bottom border of the
-// Omnibox).
-const int kLocationIconBottomMargin = 5;
+const int kConnectionSectionPaddingBottom = 16;
+const int kConnectionSectionPaddingLeft = 18;
+const int kConnectionSectionPaddingTop = 16;
+const int kConnectionSectionPaddingRight = 18;
 
 // Font size of the label for the site identity.
 const int kIdentityNameFontSize = 14;
 // The text color that is used for the site identity status text, if the site's
 // identity was sucessfully verified.
 const int kIdentityVerifiedTextColor = 0xFF298a27;
 
 // Left icon margin.
-const int kIconMarginLeft = 4;
+const int kIconMarginLeft = 6;
 
 // Margin and padding values for the |PopupHeaderView|.
 const int kHeaderMarginBottom = 10;
 const int kHeaderPaddingBottom = 12;
 const int kHeaderPaddingLeft = 18;
 const int kHeaderPaddingRight = 8;
 const int kHeaderPaddingTop = 12;
 
 // Spacing between the site identity label and the site identity status text in
 // the popup header.
 const int kHeaderRowSpacing = 4;
 
+// In order to make the arrow of the bubble point directly at the location icon
+// in the Omnibox rather then the bottom border of the Omnibox, the position of
+// the bubble must be adjusted. This is the number of pixel the bubble must be
+// moved towards the top of the screen (starting from the bottom border of the
+// Omnibox).
+const int kLocationIconBottomMargin = 5;
+
 // The margins between the popup border and the popup content.
 const int kPopupMarginTop = 4;
 const int kPopupMarginLeft = 0;
 const int kPopupMarginBottom = 10;
 const int kPopupMarginRight = 0;
 
-// Padding values for sections.
-const int kSectionPaddingBottom = 6;
-const int kSectionPaddingLeft = 18;
-const int kSectionPaddingTop = 16;
-
-// Space between a section headline and the section content.
-const int kSectionHeadlineMarginBottom = 12;
-// The content of the "Permissions" section and of the "Cookies and Site Data"
-// section, is structured in individual rows. |kSectionRowSpaceing| is the
-// space between these rows.
-const int kSectionRowSpacing = 6;
-
 // Padding values for sections on the permissions tab.
 const int kPermissionsSectionPaddingBottom = 6;
-const int kPermissionsSectionPaddingLeft = 10;
-const int kPermissionsSectionPaddingTop = 14;
+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 = 6;
+const int kPermissionsSectionRowSpacing = 2;
 
 // The max width of the popup.
 const int kPopupWidth = 310;
 
+const int kSiteDataIconColumnWidth = 20;
+const int kSiteDataSectionRowSpacing = 11;
+
 // Returns true if the passed |url| refers to an internal chrome page.
 bool InternalChromePage(const GURL& url) {
   return url.SchemeIs(chrome::kChromeInternalScheme) ||
          url.SchemeIs(chrome::kChromeUIScheme);
 }
 
 }  // namespace
 
 // |PopupHeaderView| is the UI element (view) that represents the header of the
 // |WebsiteSettingsPopupView|. The header shows the status of the site's
@@ skipping 272 matching lines @@
 
   views::GridLayout* layout = new views::GridLayout(site_data_content_);
   site_data_content_->SetLayoutManager(layout);
 
   const int site_data_content_column = 0;
   views::ColumnSet* column_set =
       layout->AddColumnSet(site_data_content_column);
   column_set->AddColumn(views::GridLayout::FILL,
                         views::GridLayout::FILL,
                         1,
-                        views::GridLayout::USE_PREF,
-                        0,
+                        views::GridLayout::FIXED,
+                        kSiteDataIconColumnWidth,
                         0);
   column_set->AddPaddingColumn(0, kIconMarginLeft);
   column_set->AddColumn(views::GridLayout::FILL,
                         views::GridLayout::FILL,
                         1,
                         views::GridLayout::USE_PREF,
                         0,
                         0);
 
+  layout->AddPaddingRow(1, 5);
   for (CookieInfoList::const_iterator i(cookie_info_list.begin());
        i != cookie_info_list.end();
        ++i) {
     string16 label_text = l10n_util::GetStringFUTF16(
         IDS_WEBSITE_SETTINGS_SITE_DATA_STATS_LINE,
         UTF8ToUTF16(i->cookie_source),
         base::IntToString16(i->allowed),
         base::IntToString16(i->blocked));
+    if (i != cookie_info_list.begin())
+      layout->AddPaddingRow(1, kSiteDataSectionRowSpacing);
     layout->StartRow(1, site_data_content_column);
     views::ImageView* icon = new views::ImageView();
     const gfx::Image& image = WebsiteSettingsUI::GetPermissionIcon(
         CONTENT_SETTINGS_TYPE_COOKIES, CONTENT_SETTING_ALLOW);
     icon->SetImage(image.ToImageSkia());
-    layout->AddView(icon);
-    layout->AddView(new views::Label(label_text),
-                    1,
-                    1,
-                    views::GridLayout::LEADING,
+    layout->AddView(icon, 1, 1, views::GridLayout::CENTER,
                     views::GridLayout::CENTER);
-
-    layout->AddPaddingRow(1, kPermissionsSectionRowSpacing);
+    layout->AddView(new views::Label(label_text), 1, 1,
+                    views::GridLayout::LEADING, views::GridLayout::CENTER);
   }
+  layout->AddPaddingRow(1, 6);
 
   layout->Layout(site_data_content_);
   SizeToContents();
 }
 
 void WebsiteSettingsPopupView::SetPermissionInfo(
     const PermissionInfoList& permission_info_list) {
   permissions_content_->RemoveAllChildViews(true);
 
   views::GridLayout* layout =
@@ skipping 248 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);
 }