Use tab to group "Show saved passwords" and "Exceptions"...

chrome/browser/views/options/exceptions_page_view.cc

Index: chrome/browser/views/options/exceptions_page_view.cc
===================================================================
--- chrome/browser/views/options/exceptions_page_view.cc	(revision 0)
+++ chrome/browser/views/options/exceptions_page_view.cc	(revision 0)
@@ -0,0 +1,179 @@
+// 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 "base/string_util.h"
+#include "chrome/browser/profile.h"
+#include "chrome/browser/views/standard_layout.h"
+#include "chrome/common/l10n_util.h"
+#include "chrome/common/pref_names.h"
+#include "chrome/common/pref_service.h"
+#include "chrome/views/background.h"
+#include "chrome/views/controls/button/native_button.h"
+#include "chrome/views/grid_layout.h"
+#include "grit/generated_resources.h"
+
+using views::ColumnSet;
+using views::GridLayout;
+
+///////////////////////////////////////////////////////////////////////////////
+// ExceptionsTableModel
+ExceptionsTableModel::ExceptionsTableModel(Profile* profile)
+    : PasswordsTableModel(profile) {
+}
+
+ExceptionsTableModel::~ExceptionsTableModel() {
+}
+
+std::wstring ExceptionsTableModel::GetText(int row, int col_id) {
+  DCHECK_EQ(col_id, IDS_PASSWORDS_PAGE_VIEW_SITE_COLUMN);
+  return PasswordsTableModel::GetText(row, col_id);
+}
+
+int ExceptionsTableModel::CompareValues(int row1, int row2,
+                                                       int col_id) {
+  DCHECK_EQ(col_id, IDS_PASSWORDS_PAGE_VIEW_SITE_COLUMN);
+  return PasswordsTableModel::CompareValues(row1, row2, col_id);
+}
+
+void ExceptionsTableModel::GetAllExceptionsForProfile() {
+  DCHECK(!pending_login_query_);
+  pending_login_query_ = web_data_service()->GetAllLogins(this);
+}
+
+void ExceptionsTableModel::OnWebDataServiceRequestDone(
+    WebDataService::Handle h,
+    const WDTypedResult* result) {
+  DCHECK_EQ(pending_login_query_, h);
+  pending_login_query_ = NULL;
+
+  if (!result)
+    return;
+
+  DCHECK(result->GetType() == PASSWORD_RESULT);
+
+  // Get the result from the database into a useable form.
+  const WDResult<std::vector<PasswordForm*> >* r =
+      static_cast<const WDResult<std::vector<PasswordForm*> >*>(result);
+  std::vector<PasswordForm*> rows = r->GetValue();
+  STLDeleteElements<PasswordRows>(&saved_signons_);
+  std::wstring languages =
+      profile_->GetPrefs()->GetString(prefs::kAcceptLanguages);
+  for (size_t i = 0; i < rows.size(); ++i) {
+    if (rows[i]->blacklisted_by_user) {
+      saved_signons_.push_back(new PasswordRow(
+          gfx::SortedDisplayURL(rows[i]->origin, languages), rows[i]));
+    }
+  }
+  if (observer_)
+    observer_->OnModelChanged();
+  if (row_count_observer_)
+    row_count_observer_->OnRowCountChanged(RowCount());
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// ExceptionsPageView, public
+ExceptionsPageView::ExceptionsPageView(Profile* profile)
+    : OptionsPageView(profile),
+      remove_button_(this, l10n_util::GetString(
+          IDS_EXCEPTIONS_PAGE_VIEW_REMOVE_BUTTON)),
+      remove_all_button_(this, l10n_util::GetString(
+          IDS_EXCEPTIONS_PAGE_VIEW_REMOVE_ALL_BUTTON)),
+      table_model_(profile),
+      table_view_(NULL) {
+}
+
+void ExceptionsPageView::OnSelectionChanged() {
+  bool has_selection = table_view_->SelectedRowCount() > 0;
+  remove_button_.SetEnabled(has_selection);
+}
+
+void ExceptionsPageView::ButtonPressed(views::Button* sender) {
+  // Close will result in our destruction.
+  if (sender == &remove_all_button_) {
+    table_model_.ForgetAndRemoveAllSignons();
+    return;
+  }
+
+  // The following require a selection (and only one, since table is single-
+  // select only).
+  views::TableSelectionIterator iter = table_view_->SelectionBegin();
+  int row = *iter;
+  PasswordForm* selected = table_model_.GetPasswordFormAt(row);
+  DCHECK(++iter == table_view_->SelectionEnd());
+
+  if (sender == &remove_button_) {
+    table_model_.ForgetAndRemoveSignon(row);
+  } else {
+    NOTREACHED() << "Invalid button.";
+  }
+}
+
+void ExceptionsPageView::OnRowCountChanged(size_t rows) {
+  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);
+
+  // Design the grid.
+  ColumnSet* column_set = layout->AddColumnSet(column_set_id);
+  column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
+                        GridLayout::FIXED, 300, 0);
+  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddColumn(GridLayout::FILL, GridLayout::LEADING, 0,
+                        GridLayout::USE_PREF, 0, 0);
+
+  // Fill the grid.
+  layout->StartRow(0.05f, column_set_id);
+  layout->AddView(table_view_, 1, 2);
+  layout->AddView(&remove_button_);
+  layout->StartRow(0.80f, column_set_id);
+  layout->SkipColumns(1);
+  layout->AddView(&remove_all_button_);
+  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+
+  // Ask the database for exception data.
+  table_model_.GetAllExceptionsForProfile();
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// ExceptionsPageView, private
+void ExceptionsPageView::SetupButtons() {
+  remove_button_.SetParentOwned(false);
+  remove_button_.SetEnabled(false);
+
+  remove_all_button_.SetParentOwned(false);
+  remove_all_button_.SetEnabled(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<views::TableColumn> columns;
+  columns.push_back(views::TableColumn(
+      IDS_PASSWORDS_PAGE_VIEW_SITE_COLUMN,
+      views::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);
+}