Revert 221424 "Save password functionality added to the save pas..."

trunk/src/chrome/browser/ui/views/content_setting_bubble_contents.cc

Index: trunk/src/chrome/browser/ui/views/content_setting_bubble_contents.cc
===================================================================
--- trunk/src/chrome/browser/ui/views/content_setting_bubble_contents.cc	(revision 221694)
+++ trunk/src/chrome/browser/ui/views/content_setting_bubble_contents.cc	(working copy)
@@ -148,9 +148,7 @@
       web_contents_(web_contents),
       custom_link_(NULL),
       manage_link_(NULL),
-      close_button_(NULL),
-      never_button_(NULL),
-      save_button_(NULL) {
+      close_button_(NULL) {
   // Compensate for built-in vertical padding in the anchor view's image.
   set_anchor_view_insets(gfx::Insets(5, 0, 5, 0));
 
@@ -391,56 +389,22 @@
     layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   }
 
-  const int kDoubleColumnSetId = 2;
-  if (content_setting_bubble_model_->content_type() ==
-      CONTENT_SETTINGS_TYPE_SAVE_PASSWORD) {
-    views::ColumnSet* double_column_set =
-        layout->AddColumnSet(kDoubleColumnSetId);
-    double_column_set->AddColumn(GridLayout::TRAILING, GridLayout::CENTER, 1,
-                                 GridLayout::USE_PREF, 0, 0);
-    double_column_set->AddPaddingColumn(
-        0, views::kRelatedControlSmallVerticalSpacing);
-    double_column_set->AddColumn(GridLayout::TRAILING, GridLayout::CENTER, 0,
-                                 GridLayout::USE_PREF, 0, 0);
+  const int kDoubleColumnSetId = 1;
+  views::ColumnSet* double_column_set =
+      layout->AddColumnSet(kDoubleColumnSetId);
+  double_column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 1,
+                        GridLayout::USE_PREF, 0, 0);
+  double_column_set->AddPaddingColumn(
+      0, views::kUnrelatedControlHorizontalSpacing);
+  double_column_set->AddColumn(GridLayout::TRAILING, GridLayout::CENTER, 0,
+                        GridLayout::USE_PREF, 0, 0);
 
-    const int kSingleColumnRightSetId = 1;
-    views::ColumnSet* right_column_set =
-        layout->AddColumnSet(kSingleColumnRightSetId);
-    right_column_set->AddColumn(GridLayout::TRAILING, GridLayout::FILL, 1,
-                                GridLayout::USE_PREF, 0, 0);
-
-    never_button_ = new views::LabelButton(
-        this, l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_BLACKLIST_BUTTON));
-    never_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
-    save_button_ = new views::LabelButton(
-        this, l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_SAVE_BUTTON));
-    save_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
-    manage_link_ = new views::Link(UTF8ToUTF16(bubble_content.manage_link));
-    manage_link_->set_listener(this);
-
-    // Buttons row
-    layout->StartRow(0, kDoubleColumnSetId);
-    layout->AddView(never_button_);
-    layout->AddView(save_button_);
-
-    // Manage link row
-    layout->StartRow(0, kSingleColumnRightSetId);
-    layout->AddView(manage_link_);
-  } else {
-    views::ColumnSet* double_column_set =
-        layout->AddColumnSet(kDoubleColumnSetId);
-    double_column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 1,
-                          GridLayout::USE_PREF, 0, 0);
-    double_column_set->AddPaddingColumn(
-        0, views::kUnrelatedControlHorizontalSpacing);
-    double_column_set->AddColumn(GridLayout::TRAILING, GridLayout::CENTER, 0,
-                          GridLayout::USE_PREF, 0, 0);
-
-    layout->StartRow(0, kDoubleColumnSetId);
-    manage_link_ = new views::Link(UTF8ToUTF16(bubble_content.manage_link));
-    manage_link_->set_listener(this);
-    layout->AddView(manage_link_);
-
+  layout->StartRow(0, kDoubleColumnSetId);
+  manage_link_ = new views::Link(UTF8ToUTF16(bubble_content.manage_link));
+  manage_link_->set_listener(this);
+  layout->AddView(manage_link_);
+  if (content_setting_bubble_model_->content_type() !=
+      CONTENT_SETTINGS_TYPE_SAVE_PASSWORD) {
     close_button_ =
         new views::LabelButton(this, l10n_util::GetStringUTF16(IDS_DONE));
     close_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
@@ -450,16 +414,6 @@
 
 void ContentSettingBubbleContents::ButtonPressed(views::Button* sender,
                                                  const ui::Event& event) {
-  if (sender == save_button_) {
-    content_setting_bubble_model_->OnSaveClicked();
-    StartFade(false);
-    return;
-  }
-  if (sender == never_button_) {
-    content_setting_bubble_model_->OnCancelClicked();
-    StartFade(false);
-    return;
-  }
   if (sender == close_button_) {
     content_setting_bubble_model_->OnDoneClicked();
     StartFade(false);