Save password functionality added to the save password bubble

chrome/browser/ui/views/content_setting_bubble_contents.cc

Index: chrome/browser/ui/views/content_setting_bubble_contents.cc
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc
index b600e35991af1466a5e545372baf6fcfe0330ad4..3d6639a2d5d3961abe7cbe88117f71997c630f7a 100644
--- a/chrome/browser/ui/views/content_setting_bubble_contents.cc
+++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc
@@ -146,11 +146,11 @@ ContentSettingBubbleContents::ContentSettingBubbleContents(
     : BubbleDelegateView(anchor_view, arrow),
       content_setting_bubble_model_(content_setting_bubble_model),
       web_contents_(web_contents),
+      cancel_button_(NULL),
+      save_button_(NULL),
       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));
 
@@ -383,19 +383,11 @@ void ContentSettingBubbleContents::Init() {
     bubble_content_empty = false;
   }
 
-  if (!bubble_content_empty) {
-    layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
-    layout->StartRow(0, kSingleColumnSetId);
-    layout->AddView(new views::Separator(views::Separator::HORIZONTAL), 1, 1,
-                    GridLayout::FILL, GridLayout::FILL);
-    layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
-  }
-
+  const int kDoubleColumnSetId = 1;
+  views::ColumnSet* double_column_set =
+      layout->AddColumnSet(kDoubleColumnSetId);
   if (content_setting_bubble_model_->content_type() ==
       CONTENT_SETTINGS_TYPE_SAVE_PASSWORD) {
-    const int kDoubleColumnSetId = 2;
-    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(
@@ -403,39 +395,50 @@ void ContentSettingBubbleContents::Init() {
     double_column_set->AddColumn(GridLayout::TRAILING, GridLayout::CENTER, 0,
                                  GridLayout::USE_PREF, 0, 0);
 
-    const int kSingleColumnRightSetId = 1;
+    const int kSingleColumnRightSetId = 2;
     views::ColumnSet* right_column_set =
         layout->AddColumnSet(kSingleColumnRightSetId);
     right_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
                                 GridLayout::USE_PREF, 0, 0);
 
-    never_button_ = new views::LabelButton(
+    cancel_button_ = new views::LabelButton(
         this, l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_BLACKLIST_BUTTON));
-    never_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+    cancel_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->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+
     layout->StartRow(0, kDoubleColumnSetId);
-    layout->AddView(never_button_);
+    layout->AddView(cancel_button_);
     layout->AddView(save_button_);
 
-    // Manage link row
+    layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+    layout->StartRow(0, kSingleColumnSetId);
+    layout->AddView(new views::Separator(views::Separator::HORIZONTAL), 1, 1,
+                    GridLayout::FILL, GridLayout::FILL);
+    layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+
     layout->StartRow(0, kSingleColumnRightSetId);
     layout->AddView(manage_link_);
   } else {
-    const int kDoubleColumnSetId = 1;
-    views::ColumnSet* double_column_set =
-        layout->AddColumnSet(kDoubleColumnSetId);
+    if (!bubble_content_empty) {
+      layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+      layout->StartRow(0, kSingleColumnSetId);
+      layout->AddView(new views::Separator(views::Separator::HORIZONTAL), 1, 1,
+                      GridLayout::FILL, GridLayout::FILL);
+      layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
+    }
+
     double_column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 1,
-                          GridLayout::USE_PREF, 0, 0);
+                                 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);
+                                 GridLayout::USE_PREF, 0, 0);
 
     layout->StartRow(0, kDoubleColumnSetId);
     manage_link_ = new views::Link(UTF8ToUTF16(bubble_content.manage_link));
@@ -451,30 +454,22 @@ void ContentSettingBubbleContents::Init() {
 
 void ContentSettingBubbleContents::ButtonPressed(views::Button* sender,
                                                  const ui::Event& event) {
-  if (sender == save_button_) {
-    content_setting_bubble_model_->OnSaveClicked();
-    StartFade(false);
+  RadioGroup::const_iterator i(
+      std::find(radio_group_.begin(), radio_group_.end(), sender));
+  if (i != radio_group_.end()) {
+    content_setting_bubble_model_->OnRadioClicked(i - radio_group_.begin());
     return;
   }
-  if (sender == never_button_) {
+
+  if (sender == save_button_)
+    content_setting_bubble_model_->OnSaveClicked();
+  else if (sender == cancel_button_)
     content_setting_bubble_model_->OnCancelClicked();
-    StartFade(false);
-    return;
-  }
-  if (sender == close_button_) {
+  else if (sender == close_button_)
     content_setting_bubble_model_->OnDoneClicked();
-    StartFade(false);
-    return;
-  }
-
-  for (RadioGroup::const_iterator i(radio_group_.begin());
-       i != radio_group_.end(); ++i) {
-    if (sender == *i) {
-      content_setting_bubble_model_->OnRadioClicked(i - radio_group_.begin());
-      return;
-    }
-  }
-  NOTREACHED() << "unknown radio";
+  else
+    NOTREACHED();
+  StartFade(false);
 }
 
 void ContentSettingBubbleContents::LinkClicked(views::Link* source,