[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..8966940c4004eb7d6bf9e0cd7882b550aacb0c46 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) {
@@ -343,15 +364,17 @@ void ContentSettingBubbleGtk::BuildBubble() {
   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) {
+    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);

[Evan Stade, 2013/09/06 21:15:45]

I don't understand why there were previously two grab_focus calls in a row, but
it seems that inverting the order of them might not do what you want?

does the grab_focus call on the |bottom_box| even do anything? Gtk docs say that
it needs to be focusable to have any effect.

[Evan Stade, 2013/09/09 20:44:07]

they were added here: https://codereview.chromium.org/1360007

let's see if there's any response. I'd rather not just leave this mysterious
code here (we can at least add a comment to it).

[npentrel, 2013/09/10 16:25:34]

Done.

 
   bubble_ = BubbleGtk::Show(anchor_,
                             NULL,
@@ -397,11 +420,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();