A patch to make the grid column (table_view) of the passwords_page_vie...

chrome/browser/views/options/exceptions_page_view.cc

 // Copyright (c) 2009 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/views/options/exceptions_page_view.h"
 
 #include "app/l10n_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/pref_names.h"
@@ skipping 60 matching lines @@
   if (observer_)
     observer_->OnModelChanged();
   if (row_count_observer_)
     row_count_observer_->OnRowCountChanged(RowCount());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // ExceptionsPageView, public
 ExceptionsPageView::ExceptionsPageView(Profile* profile)
     : OptionsPageView(profile),
+      ALLOW_THIS_IN_INITIALIZER_LIST(show_button_(
+          this,
+          l10n_util::GetString(IDS_PASSWORDS_PAGE_VIEW_SHOW_BUTTON),
+          l10n_util::GetString(IDS_PASSWORDS_PAGE_VIEW_HIDE_BUTTON))),
       ALLOW_THIS_IN_INITIALIZER_LIST(remove_button_(
           this,
           l10n_util::GetString(IDS_EXCEPTIONS_PAGE_VIEW_REMOVE_BUTTON))),
       ALLOW_THIS_IN_INITIALIZER_LIST(remove_all_button_(
           this,
           l10n_util::GetString(IDS_EXCEPTIONS_PAGE_VIEW_REMOVE_ALL_BUTTON))),
       table_model_(profile),
       table_view_(NULL) {
 }
 
@@ skipping 27 matching lines @@
   remove_all_button_.SetEnabled(rows > 0);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // ExceptionsPageView, protected
 void ExceptionsPageView::InitControlLayout() {
   SetupButtons();
   SetupTable();
 
   // Do the layout thing.
-  const int column_set_id = 0;
   GridLayout* layout = CreatePanelGridLayout(this);
   SetLayoutManager(layout);
 
+  const int top_column_set_id = 0;
+
   // Design the grid.
-  ColumnSet* column_set = layout->AddColumnSet(column_set_id);
+  ColumnSet* column_set = layout->AddColumnSet(top_column_set_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
 
   // Fill the grid.
-  layout->StartRow(0, column_set_id);
-  layout->AddView(table_view_, 1, 4, GridLayout::FILL,
+  layout->StartRow(0, top_column_set_id);
+  layout->AddView(table_view_, 1, 6, GridLayout::FILL,
                   GridLayout::FILL);
   layout->AddView(&remove_button_);
-  layout->StartRowWithPadding(0, column_set_id, 0,
+  layout->StartRowWithPadding(0, top_column_set_id, 0,
                               kRelatedControlVerticalSpacing);
   layout->SkipColumns(1);
   layout->AddView(&remove_all_button_);
+  layout->StartRowWithPadding(0, top_column_set_id, 0,
+                              kRelatedControlVerticalSpacing);
+
+  layout->SkipColumns(1);
+  layout->AddView(&show_button_);
   layout->AddPaddingRow(1, 0);
 
   // Ask the database for exception data.
   table_model_.GetAllExceptionsForProfile();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // ExceptionsPageView, private
 void ExceptionsPageView::SetupButtons() {
+  // Disable all buttons in the first place.
   remove_button_.SetParentOwned(false);
   remove_button_.SetEnabled(false);
 
   remove_all_button_.SetParentOwned(false);
   remove_all_button_.SetEnabled(false);
+
+  show_button_.SetParentOwned(false);
+  show_button_.SetEnabled(false);
+  show_button_.SetVisible(false);
 }
 
 void ExceptionsPageView::SetupTable() {
   // Tell the table model we are concerned about how many rows it has.
   table_model_.set_row_count_observer(this);
 
   // Creates the different columns for the table.
   // The float resize values are the result of much tinkering.
   std::vector<TableColumn> columns;
-  columns.push_back(TableColumn(
-      IDS_PASSWORDS_PAGE_VIEW_SITE_COLUMN,
-      TableColumn::LEFT, -1, 0.55f));
+  columns.push_back(TableColumn(IDS_PASSWORDS_PAGE_VIEW_SITE_COLUMN,
+                                TableColumn::LEFT, -1, 0.55f));
   columns.back().sortable = true;
   table_view_ = new views::TableView(&table_model_, columns, views::TEXT_ONLY,
                                      true, true, true);
   // Make the table initially sorted by host.
   views::TableView::SortDescriptors sort;
   sort.push_back(views::TableView::SortDescriptor(
       IDS_PASSWORDS_PAGE_VIEW_SITE_COLUMN, true));
   table_view_->SetSortDescriptors(sort);
   table_view_->SetObserver(this);
 }