Fix broken paddings of the WebsiteSettingsPopopView.

chrome/browser/ui/views/website_settings/permission_selector_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/permission_selector_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // Left icon margin.
 const int kPermissionIconMarginLeft = 6;
 // The width of the column that contains the permissions icons.
 const int kPermissionIconColumnWidth = 20;
-// Left margin of the label that displays the permission types.
-const int kPermissionsRowLabelMarginLeft = 8;
 
 // An array with |ContentSetting|s ordered by CommandID. The array is used to
 // lookup a content setting for a given command id.
 const ContentSetting kSettingsForCommandIDs[] = {
   CONTENT_SETTING_DEFAULT,  // COMMAND_SET_TO_DEFAULT
   CONTENT_SETTING_ALLOW,    // COMMAND_SET_TO_ALLOW
   CONTENT_SETTING_BLOCK,    // COMMAND_SET_TO_BLOCK
 };
 
 }  // namespace
@@ skipping 169 matching lines @@
                         views::GridLayout::FIXED,
                         kPermissionIconColumnWidth,
                         0);
   column_set->AddPaddingColumn(0, kPermissionIconMarginLeft);
   column_set->AddColumn(views::GridLayout::FILL,
                         views::GridLayout::FILL,
                         1,
                         views::GridLayout::USE_PREF,
                         0,
                         0);
-  column_set->AddPaddingColumn(0, kPermissionsRowLabelMarginLeft);
   column_set->AddColumn(views::GridLayout::FILL,
                         views::GridLayout::FILL,
                         1,
                         views::GridLayout::USE_PREF,
                         0,
                         0);
 
   layout->StartRow(1, column_set_id);
   // Create the permission icon.
   icon_ = new views::ImageView();
@@ skipping 54 matching lines @@
 ContentSetting PermissionSelectorView::GetSelectedSetting() const {
   return menu_button_model_->current_setting();
 }
 
 ContentSettingsType PermissionSelectorView::GetPermissionType() const {
   return menu_button_model_->site_permission();
 }
 
 PermissionSelectorView::~PermissionSelectorView() {
 }