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..df54fe92cdaa35fb36cc5fb093d09861d93bbb1f 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));
 
@@ -391,11 +391,28 @@ void ContentSettingBubbleContents::Init() {
     layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   }
 
-  if (content_setting_bubble_model_->content_type() ==
+  const int kDoubleColumnSetId = 1;
+  views::ColumnSet* double_column_set =
+      layout->AddColumnSet(kDoubleColumnSetId);
+  if (content_setting_bubble_model_->content_type() !=

[Peter Kasting, 2013/09/10 23:04:41]

Tiny nit: I think the original ordering of "== SAVE_PASSWORD" was fractionally
better.

[npentrel, 2013/09/11 09:10:42]

Done.

       CONTENT_SETTINGS_TYPE_SAVE_PASSWORD) {
-    const int kDoubleColumnSetId = 2;
-    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_);
+
+    close_button_ =
+        new views::LabelButton(this, l10n_util::GetStringUTF16(IDS_DONE));
+    close_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
+    layout->AddView(close_button_);
+  } else {
     double_column_set->AddColumn(GridLayout::TRAILING, GridLayout::CENTER, 1,
                                  GridLayout::USE_PREF, 0, 0);
     double_column_set->AddPaddingColumn(
@@ -403,78 +420,49 @@ 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->StartRow(0, kDoubleColumnSetId);
-    layout->AddView(never_button_);
+    layout->AddView(cancel_button_);
     layout->AddView(save_button_);
 
-    // Manage link row
     layout->StartRow(0, kSingleColumnRightSetId);
     layout->AddView(manage_link_);
-  } else {
-    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);
-
-    layout->StartRow(0, kDoubleColumnSetId);
-    manage_link_ = new views::Link(UTF8ToUTF16(bubble_content.manage_link));
-    manage_link_->set_listener(this);
-    layout->AddView(manage_link_);
-
-    close_button_ =
-        new views::LabelButton(this, l10n_util::GetStringUTF16(IDS_DONE));
-    close_button_->SetStyle(views::Button::STYLE_NATIVE_TEXTBUTTON);
-    layout->AddView(close_button_);
   }
 }
 
 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;
-  }
+  else
+    NOTREACHED() << "unknown radio";

[Peter Kasting, 2013/09/10 23:04:41]

Nit: Remove this comment, which is not necessarily accurate and not helpful
anyway.

[npentrel, 2013/09/11 09:10:42]

Done.

[Peter Kasting, 2013/09/10 23:04:41]

Tiny nit: I'd probably remove this blank line

[npentrel, 2013/09/11 09:10:42]

Done.

-  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";
+  StartFade(false);
 }
 
 void ContentSettingBubbleContents::LinkClicked(views::Link* source,