Clear Grab everytime before tring to grab input

 It's not clear why it's failing to grab the input.
 This could be because someone is stealing the grab at the same time and I lost.
 This CL changes TryGrabAllIput so that next time it will succeeds.

BUG=chromium-os:5902
TEST=none

Review URL: http://codereview.chromium.org/3134040

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57590 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 3 deletions

diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc
index 2692fad..c8f1f06 100644
--- a/chrome/browser/chromeos/login/screen_locker.cc
+++ b/chrome/browser/chromeos/login/screen_locker.cc
@@ -213,6 +213,11 @@ class GrabWidget : public views::WidgetGtk {
 
   virtual void Show() {
     views::WidgetGtk::Show();
+    // Now steal all inputs.
+    TryGrabAllInputs();
+  }
+
+  void ClearGrab() {
     GtkWidget* current_grab_window;
     // Grab gtk input first so that the menu holding grab will close itself.
     gtk_grab_add(window_contents());
@@ -224,9 +229,6 @@ class GrabWidget : public views::WidgetGtk {
     // until it's empty.
     while ((current_grab_window = gtk_grab_get_current()) != NULL)
       gtk_grab_remove(current_grab_window);
-
-    // Now steal all inputs.
-    TryGrabAllInputs();
   }
 
   virtual gboolean OnButtonPress(GtkWidget* widget, GdkEventButton* event) {
@@ -263,6 +265,8 @@ class GrabWidget : public views::WidgetGtk {
 };
 
 void GrabWidget::TryGrabAllInputs() {
+  ClearGrab();
+
   if (kbd_grab_status_ != GDK_GRAB_SUCCESS) {
     kbd_grab_status_ = gdk_keyboard_grab(window_contents()->window, FALSE,
                                          GDK_CURRENT_TIME);