[gtk] re-acquire input grab on bubbles when another widget

chrome/browser/ui/gtk/bookmarks/bookmark_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/bookmarks/bookmark_bubble_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 165 matching lines @@
     NOTREACHED();
     return;
   }
 
   g_signal_connect(content, "destroy",
                    G_CALLBACK(&OnDestroyThunk), this);
   g_signal_connect(name_entry_, "activate",
                    G_CALLBACK(&OnNameActivateThunk), this);
   g_signal_connect(folder_combo_, "changed",
                    G_CALLBACK(&OnFolderChangedThunk), this);
-  g_signal_connect(folder_combo_, "notify::popup-shown",
-                   G_CALLBACK(&OnFolderPopupShownThunk), this);
   g_signal_connect(edit_button, "clicked",
                    G_CALLBACK(&OnEditClickedThunk), this);
   g_signal_connect(close_button, "clicked",
                    G_CALLBACK(&OnCloseClickedThunk), this);
   g_signal_connect(remove_button_, "clicked",
                    G_CALLBACK(&OnRemoveClickedThunk), this);
 
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  content::Source<ThemeService>(theme_service_));
   theme_service_->InitThemesFor(this);
@@ skipping 33 matching lines @@
     // GTK doesn't handle having the combo box destroyed from the changed
     // signal.  Since showing the editor also closes the bubble, delay this
     // so that GTK can unwind.  Specifically gtk_menu_shell_button_release
     // will run, and we need to keep the combo box alive until then.
     MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&BookmarkBubbleGtk::ShowEditor, factory_.GetWeakPtr()));
   }
 }
 
-void BookmarkBubbleGtk::OnFolderPopupShown(GtkWidget* widget,
-                                           GParamSpec* property) {
-  // GtkComboBox grabs the keyboard and pointer when it displays its popup,
-  // which steals the grabs that BubbleGtk had installed.  When the popup is
-  // hidden, we notify BubbleGtk so it can try to reacquire the grabs
-  // (otherwise, GTK won't activate our widgets when the user clicks in them).
-  gboolean popup_shown = FALSE;
-  g_object_get(G_OBJECT(folder_combo_), "popup-shown", &popup_shown, NULL);
-  if (!popup_shown)
-    bubble_->HandlePointerAndKeyboardUngrabbedByContent();
-}
-
 void BookmarkBubbleGtk::OnEditClicked(GtkWidget* widget) {
   content::RecordAction(UserMetricsAction("BookmarkBubble_Edit"));
   ShowEditor();
 }
 
 void BookmarkBubbleGtk::OnCloseClicked(GtkWidget* widget) {
   bubble_->Close();
 }
 
 void BookmarkBubbleGtk::OnRemoveClicked(GtkWidget* widget) {
@@ skipping 72 matching lines @@
   // We always have nodes + 1 entries in the combo.  The last entry will be
   // the 'Select another folder...' entry that opens the bookmark editor.
   for (int i = 0; i < folder_combo_model_->GetItemCount(); ++i) {
     gtk_combo_box_append_text(GTK_COMBO_BOX(folder_combo_),
         UTF16ToUTF8(folder_combo_model_->GetItemAt(i)).c_str());
   }
 
   gtk_combo_box_set_active(GTK_COMBO_BOX(folder_combo_),
                            folder_combo_model_->node_parent_index());
 }