[gtk] Save password bubble

chrome/browser/ui/gtk/content_setting_bubble_gtk.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/content_setting_bubble_gtk.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 274 matching lines @@
     menu_width = std::min(kMaxMediaMenuButtonWidth, menu_width);
 
     // Set all the menu buttons to the width we calculated above.
     for (GtkMediaMenuMap::const_iterator i = media_menus_.begin();
          i != media_menus_.end(); ++i)
       gtk_widget_set_size_request(i->first, menu_width, -1);
 
     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) {
     // Put each list into its own vbox to allow spacing between lists.
     GtkWidget* list_content = gtk_vbox_new(FALSE, ui::kControlSpacing);
 
     GtkWidget* label = theme_provider->BuildLabel(
         BuildElidedText(i->title).c_str(), ui::kGdkBlack);
     gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
     GtkWidget* label_box = gtk_hbox_new(FALSE, 0);
@@ skipping 31 matching lines @@
   gtk_box_pack_start(GTK_BOX(bubble_content), gtk_hseparator_new(),
                      FALSE, FALSE, 0);
 
   GtkWidget* bottom_box = gtk_hbox_new(FALSE, 0);
 
   GtkWidget* manage_link =
       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) {
+    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,
                             bubble_content,
                             BubbleGtk::ANCHOR_TOP_RIGHT,
                             BubbleGtk::MATCH_SYSTEM_THEME |
                                 BubbleGtk::POPUP_WINDOW |
                                 BubbleGtk::GRAB_INPUT,
                             theme_provider,
                             this);
@@ skipping 25 matching lines @@
        i != radio_group_gtk_.end(); ++i) {
     if (widget == *i) {
       content_setting_bubble_model_->OnRadioClicked(
           i - radio_group_gtk_.begin());
       return;
     }
   }
   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();
 }
 
 void ContentSettingBubbleGtk::OnManageLinkClicked(GtkWidget* button) {
   content_setting_bubble_model_->OnManageLinkClicked();
   Close();
 }
 
 void ContentSettingBubbleGtk::OnMenuButtonClicked(GtkWidget* button) {
   GtkMediaMenuMap::iterator i(media_menus_.find(button));
   DCHECK(i != media_menus_.end());
   i->second->menu->PopupForWidget(button, 1, gtk_get_current_event_time());
 }
 
 ContentSettingBubbleGtk::MediaMenuGtk::MediaMenuGtk(
     content::MediaStreamType type)
     : type(type) {}
 
 ContentSettingBubbleGtk::MediaMenuGtk::~MediaMenuGtk() {}