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

chrome/browser/views/options/content_page_view.cc

 // Copyright (c) 2006-2008 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 <windows.h>
 #include <shlobj.h>
 #include <vsstyle.h>
 #include <vssym32.h>
 
 #include "chrome/browser/views/options/content_page_view.h"
 
 #include "base/file_util.h"
 #include "base/gfx/native_theme.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/views/options/fonts_languages_window_view.h"
 #include "chrome/browser/views/options/options_group_view.h"
-#include "chrome/browser/views/password_manager_view.h"
-#include "chrome/browser/views/password_manager_exceptions_view.h"
+#include "chrome/browser/views/options/passwords_exceptions_window_view.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/controls/button/radio_button.h"
 #include "chrome/views/controls/text_field.h"
 #include "chrome/views/grid_layout.h"
 #include "chrome/views/widget/widget.h"
@@ skipping 143 matching lines @@
 ContentPageView::ContentPageView(Profile* profile)
     : download_location_group_(NULL),
       download_default_download_location_display_(NULL),
       download_browse_button_(NULL),
       download_ask_for_save_location_checkbox_(NULL),
       select_file_dialog_(SelectFileDialog::Create(this)),
       passwords_exceptions_button_(NULL),
       passwords_group_(NULL),
       passwords_asktosave_radio_(NULL),
       passwords_neversave_radio_(NULL),
-      passwords_show_passwords_button_(NULL),
       fonts_lang_group_(NULL),
       fonts_and_languages_label_(NULL),
       change_content_fonts_button_(NULL),
       OptionsPageView(profile) {
 }
 
 ContentPageView::~ContentPageView() {
   select_file_dialog_->ListenerDestroyed();
 }
 
@@ skipping 41 matching lines @@
     bool enabled = passwords_asktosave_radio_->checked();
     if (enabled) {
       UserMetricsRecordAction(L"Options_PasswordManager_Enable",
                               profile()->GetPrefs());
     } else {
       UserMetricsRecordAction(L"Options_PasswordManager_Disable",
                               profile()->GetPrefs());
     }
     ask_to_save_passwords_.SetValue(enabled);
   } else if (sender == passwords_exceptions_button_) {
-    UserMetricsRecordAction(L"Options_ShowPasswordManagerExceptions", NULL);
-    PasswordManagerExceptionsView::Show(profile());
-  }else if (sender == passwords_show_passwords_button_) {
-    UserMetricsRecordAction(L"Options_ShowPasswordManager", NULL);
-    PasswordManagerView::Show(profile());
+    UserMetricsRecordAction(L"Options_ShowPasswordsExceptions", NULL);
+    PasswordsExceptionsWindowView::Show(profile());
   } else if (sender == form_autofill_checkbox_) {
     bool enabled = form_autofill_checkbox_->checked();
     if (enabled) {
       UserMetricsRecordAction(L"Options_FormAutofill_Enable",
                               profile()->GetPrefs());
     } else {
       UserMetricsRecordAction(L"Options_FormAutofill_Disable",
                               profile()->GetPrefs());
     }
     form_autofill_.SetValue(enabled);
@@ skipping 146 matching lines @@
   passwords_asktosave_radio_ = new views::RadioButton(
       l10n_util::GetString(IDS_OPTIONS_PASSWORDS_ASKTOSAVE),
       kPasswordSavingRadioGroup);
   passwords_asktosave_radio_->set_listener(this);
   passwords_asktosave_radio_->SetMultiLine(true);
   passwords_neversave_radio_ = new views::RadioButton(
       l10n_util::GetString(IDS_OPTIONS_PASSWORDS_NEVERSAVE),
       kPasswordSavingRadioGroup);
   passwords_neversave_radio_->set_listener(this);
   passwords_neversave_radio_->SetMultiLine(true);
-  passwords_show_passwords_button_ = new views::NativeButton(
-      this, l10n_util::GetString(IDS_OPTIONS_PASSWORDS_SHOWPASSWORDS));
   passwords_exceptions_button_ = new views::NativeButton(
       this, l10n_util::GetString(IDS_OPTIONS_PASSWORDS_EXCEPTIONS));
 
   using views::GridLayout;
   using views::ColumnSet;
 
   views::View* contents = new views::View;
   GridLayout* layout = new GridLayout(contents);
   contents->SetLayoutManager(layout);
 
   const int single_column_view_set_id = 1;
   ColumnSet* column_set = layout->AddColumnSet(single_column_view_set_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   const int double_column_view_set_id = 0;
   column_set = layout->AddColumnSet(double_column_view_set_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(passwords_asktosave_radio_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(passwords_neversave_radio_);
   layout->AddPaddingRow(0, kUnrelatedControlVerticalSpacing);
-  layout->StartRow(0, double_column_view_set_id);
-  layout->AddView(passwords_show_passwords_button_);
+  layout->StartRow(0, single_column_view_set_id);
   layout->AddView(passwords_exceptions_button_);
 
   passwords_group_ = new OptionsGroupView(
       contents, l10n_util::GetString(IDS_OPTIONS_PASSWORDS_GROUP_NAME), L"",
       true);
 }
 
 void ContentPageView::InitFormAutofillGroup() {
   form_autofill_checkbox_ = new views::Checkbox(
       l10n_util::GetString(IDS_AUTOFILL_SAVEFORMS));
@@ skipping 50 matching lines @@
   fonts_lang_group_ = new OptionsGroupView(
       contents,
       l10n_util::GetString(IDS_OPTIONS_FONTSANDLANGUAGES_GROUP_NAME),
       L"", true);
 }
 
 void ContentPageView::UpdateDownloadDirectoryDisplay() {
   download_default_download_location_display_->SetFile(
       FilePath::FromWStringHack(default_download_location_.GetValue()));
 }