[gtk] Save password bubble

chrome/browser/ui/gtk/content_setting_bubble_gtk.cc

Index: chrome/browser/ui/gtk/content_setting_bubble_gtk.cc
diff --git a/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc b/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc
index aa9e25edecf7bb5b5d6dd990b499459f2528b18a..29119d311b32a402f0c444dd24072d487f3a6ba7 100644
--- a/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc
@@ -292,6 +292,27 @@ void ContentSettingBubbleGtk::BuildBubble() {
     gtk_box_pack_start(GTK_BOX(bubble_content), table, FALSE, FALSE, 0);
   }
 
+  if (content_setting_bubble_model_->content_type() ==
+      CONTENT_SETTINGS_TYPE_SAVE_PASSWORD) {
+    GtkWidget* button_content = gtk_hbox_new(FALSE, 0);
+    GtkWidget* never_button =
+        gtk_button_new_with_label(l10n_util::GetStringUTF8(
+            IDS_PASSWORD_MANAGER_BLACKLIST_BUTTON).c_str());
+    g_signal_connect(never_button, "clicked",
+                     G_CALLBACK(OnCancelButtonClickedThunk), this);
+    GtkWidget* save_button = gtk_button_new_with_label(
+        l10n_util::GetStringUTF8(IDS_PASSWORD_MANAGER_SAVE_BUTTON).c_str());
+    g_signal_connect(save_button, "clicked",
+                     G_CALLBACK(OnSaveButtonClickedThunk), this);
+
+    gtk_box_pack_start(GTK_BOX(button_content), never_button, FALSE, FALSE, 4);
+    gtk_box_pack_start(GTK_BOX(button_content), save_button, FALSE, FALSE, 0);
+
+    gtk_box_pack_start(GTK_BOX(bubble_content), button_content, FALSE, FALSE,
+                       0);
+    gtk_widget_grab_focus(save_button);
+  }
+
   for (std::vector<ContentSettingBubbleModel::DomainList>::const_iterator i =
        content.domain_lists.begin();
        i != content.domain_lists.end(); ++i) {
@@ -342,16 +363,21 @@ void ContentSettingBubbleGtk::BuildBubble() {
       theme_provider->BuildChromeLinkButton(content.manage_link.c_str());
   g_signal_connect(manage_link, "clicked", G_CALLBACK(OnManageLinkClickedThunk),
                    this);
-  gtk_box_pack_start(GTK_BOX(bottom_box), manage_link, FALSE, FALSE, 0);
-
-  GtkWidget* button = gtk_button_new_with_label(
-      l10n_util::GetStringUTF8(IDS_DONE).c_str());
-  g_signal_connect(button, "clicked", G_CALLBACK(OnCloseButtonClickedThunk),
-                   this);
-  gtk_box_pack_end(GTK_BOX(bottom_box), button, FALSE, FALSE, 0);
+  if (content_setting_bubble_model_->content_type() ==
+      CONTENT_SETTINGS_TYPE_SAVE_PASSWORD) {
+    gtk_box_pack_end(GTK_BOX(bottom_box), manage_link, FALSE, FALSE, 0);

[Evan Stade, 2013/09/05 00:52:55]

why is this not shared with the nearly identical line of code in the else case?
Is there actually a function difference between end and start in this case?

[npentrel, 2013/09/05 08:00:16]

Yes there is a difference: end will put it at the end of the box, meaning the
manage_link will appear at the right end of the box, whereas for start it will
appear at the beginning of the box (meaning on the left). This is necessary if
there is a 'done' button on the left but for the save-password bubble there is
no 'done' button and the manage_link should appear on the right. 

[Evan Stade, 2013/09/05 16:43:00]

not sure why we'd move the link to the right when there's no Done button. Did
some UI designer come up with a mock that highlighted this as an important
difference of the save password bubble? If you look at other links (for example
the one at the bottom of the 'connection' tab of the cookies + permission
bubble) they are left-flush.

+  } else {
+    gtk_box_pack_start(GTK_BOX(bottom_box), manage_link, FALSE, FALSE, 0);
+
+    GtkWidget* button =
+        gtk_button_new_with_label(l10n_util::GetStringUTF8(IDS_DONE).c_str());
+    g_signal_connect(button, "clicked", G_CALLBACK(OnCloseButtonClickedThunk),
+                     this);
+    gtk_box_pack_end(GTK_BOX(bottom_box), button, FALSE, FALSE, 0);
+    gtk_widget_grab_focus(button);
+  }
   gtk_box_pack_start(GTK_BOX(bubble_content), bottom_box, FALSE, FALSE, 0);
   gtk_widget_grab_focus(bottom_box);
-  gtk_widget_grab_focus(button);
 
   bubble_ = BubbleGtk::Show(anchor_,
                             NULL,
@@ -397,11 +423,21 @@ void ContentSettingBubbleGtk::OnRadioToggled(GtkWidget* widget) {
   NOTREACHED() << "unknown radio toggled";
 }
 
-void ContentSettingBubbleGtk::OnCloseButtonClicked(GtkWidget *button) {
+void ContentSettingBubbleGtk::OnCloseButtonClicked(GtkWidget* button) {
   content_setting_bubble_model_->OnDoneClicked();
   Close();
 }
 
+void ContentSettingBubbleGtk::OnSaveButtonClicked(GtkWidget* button) {
+  content_setting_bubble_model_->OnSaveClicked();
+  Close();
+}
+
+void ContentSettingBubbleGtk::OnCancelButtonClicked(GtkWidget* button) {
+  content_setting_bubble_model_->OnCancelClicked();
+  Close();
+}
+
 void ContentSettingBubbleGtk::OnCustomLinkClicked(GtkWidget* button) {
   content_setting_bubble_model_->OnCustomLinkClicked();
   Close();