Wait sending ScreenIsLocked signal until screen lock window is mapped.

chrome/browser/chromeos/login/screen_locker.cc

 // Copyright (c) 2010 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/chromeos/login/screen_locker.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/message_loop.h"
 #include "base/singleton.h"
@@ skipping 113 matching lines @@
 
   // The number times the widget tried to grab all focus.
   int grab_failure_count_;
   // Status of keyboard and mouse grab.
   GdkGrabStatus kbd_grab_status_;
   GdkGrabStatus mouse_grab_status_;
 
   DISALLOW_COPY_AND_ASSIGN(GrabWidget);
 };
 
-
 void GrabWidget::TryGrabAllInputs() {
   if (kbd_grab_status_ != GDK_GRAB_SUCCESS)
     kbd_grab_status_ = gdk_keyboard_grab(window_contents()->window, FALSE,
                                          GDK_CURRENT_TIME);
   if (mouse_grab_status_ != GDK_GRAB_SUCCESS) {
     mouse_grab_status_ =
         gdk_pointer_grab(window_contents()->window,
                          FALSE,
                          static_cast<GdkEventMask>(
                              GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
@@ skipping 10 matching lines @@
     MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         task_factory_.NewRunnableMethod(&GrabWidget::TryGrabAllInputs),
         kRetryGrabIntervalMs);
   } else {
     CHECK_EQ(GDK_GRAB_SUCCESS, kbd_grab_status_)
         << "Failed to grab keyboard input:" << kbd_grab_status_;
     CHECK_EQ(GDK_GRAB_SUCCESS, mouse_grab_status_)
         << "Failed to grab pointer input:" << mouse_grab_status_;
     DLOG(INFO) << "Grab Success";
-    screen_locker_->ScreenLockReady();
+    screen_locker_->OnGrabInputs();
   }
 }
 
 }  // namespace
 
 namespace chromeos {
 
 // static
 ScreenLocker* ScreenLocker::screen_locker_ = NULL;
 
@@ skipping 48 matching lines @@
   // Offset from src_'s origin to dest_'s origin.
   gfx::Point offset_;
 
   DISALLOW_COPY_AND_ASSIGN(MouseEventRelay);
 };
 
 }  // namespace chromeos
 
 namespace chromeos {
 
+////////////////////////////////////////////////////////////////////////////////
+// ScreenLocker, public:
+
 ScreenLocker::ScreenLocker(const UserManager::User& user)
     : lock_window_(NULL),
       lock_widget_(NULL),
       screen_lock_view_(NULL),
       user_(user),
-      error_info_(NULL) {
+      error_info_(NULL),
+      mapped_(false),
+      input_grabbed_(false) {
   DCHECK(!screen_locker_);
   screen_locker_ = this;
 }
 
-ScreenLocker::~ScreenLocker() {
-  ClearErrors();
-  DCHECK(lock_window_);
-  lock_window_->Close();
-  // lock_widget_ will be deleted by gtk's destroy signal.
-  screen_locker_ = NULL;
-  if (CrosLibrary::Get()->EnsureLoaded())
-    CrosLibrary::Get()->GetScreenLockLibrary()->NotifyScreenUnlockCompleted();
-}
-
 void ScreenLocker::Init(const gfx::Rect& bounds) {
   // TODO(oshima): Figure out which UI to keep and remove in the background.
   views::View* screen = new BackgroundView();
   lock_window_ = new views::WidgetGtk(views::WidgetGtk::TYPE_POPUP);
   lock_window_->Init(NULL, bounds);
+  g_signal_connect(lock_window_->GetNativeView(),
+                   "map-event",
+                   G_CALLBACK(&OnMapThunk),
+                   this);
   DCHECK(GTK_WIDGET_REALIZED(lock_window_->GetNativeView()));
   WmIpc::instance()->SetWindowType(
       lock_window_->GetNativeView(),
       WM_IPC_WINDOW_CHROME_SCREEN_LOCKER,
       NULL);
   lock_window_->SetContentsView(screen);
   lock_window_->Show();
-
   authenticator_ = LoginUtils::Get()->CreateAuthenticator(this);
   screen_lock_view_ = new ScreenLockView(this);
   screen_lock_view_->Init();
 
   gfx::Size size = screen_lock_view_->GetPreferredSize();
 
   lock_widget_ = new GrabWidget(this);
   lock_widget_->MakeTransparent();
   lock_widget_->InitWithWidget(lock_window_,
                                gfx::Rect((bounds.width() - size.width()) / 2,
                                          (bounds.height() - size.width()) / 2,
                                          size.width(),
                                          size.height()));
   lock_widget_->SetContentsView(screen_lock_view_);
   lock_widget_->GetRootView()->SetVisible(false);
   lock_widget_->Show();
 }
 
-void ScreenLocker::SetAuthenticator(Authenticator* authenticator) {
-  authenticator_ = authenticator;
-}
-
 void ScreenLocker::OnLoginFailure(const std::string& error) {
   DLOG(INFO) << "OnLoginFailure";
   EnableInput();
   // Don't enable signout button here as we're showing
   // MessageBubble.
   gfx::Rect rect = screen_lock_view_->GetPasswordBoundsRelativeTo(
       lock_widget_->GetRootView());
   gfx::Rect lock_widget_bounds;
   lock_widget_->GetBounds(&lock_widget_bounds, false);
   rect.Offset(lock_widget_bounds.x(), lock_widget_bounds.y());
@@ skipping 64 matching lines @@
 void ScreenLocker::Signout() {
   if (!error_info_) {
     // TODO(oshima): record this action in user metrics.
     BrowserList::CloseAllBrowsersAndExit();
 
     // Don't hide yet the locker because the chrome screen may become visible
     // briefly.
   }
 }
 
-void ScreenLocker::ScreenLockReady() {
-  // Don't show the password field until we grab all inputs.
-  lock_widget_->GetRootView()->SetVisible(true);
-  EnableInput();
-  if (CrosLibrary::Get()->EnsureLoaded())
-    CrosLibrary::Get()->GetScreenLockLibrary()->NotifyScreenLockCompleted();
+void ScreenLocker::OnGrabInputs() {
+  DLOG(INFO) << "OnGrabInputs";
+  input_grabbed_ = true;
+  if (mapped_)
+    ScreenLockReady();
 }
 
 // static
 void ScreenLocker::Show() {
   DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_UI);
   // TODO(oshima): Currently, PowerManager may send a lock screen event
   // even if a screen is locked. Investigate & solve the issue and
   // enable this again if it's possible.
   // DCHECK(!screen_locker_);
   if (!screen_locker_) {
@@ skipping 25 matching lines @@
     // This'd be extremely rare, but may still happen.
     LOG(INFO) << "Screen is unlocked";
   }
 }
 
 // static
 void ScreenLocker::InitClass() {
   Singleton<ScreenLockObserver>::get();
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// ScreenLocker, private:
+
+ScreenLocker::~ScreenLocker() {
+  ClearErrors();
+  DCHECK(lock_window_);
+  lock_window_->Close();
+  // lock_widget_ will be deleted by gtk's destroy signal.
+  screen_locker_ = NULL;
+  if (CrosLibrary::Get()->EnsureLoaded())
+    CrosLibrary::Get()->GetScreenLockLibrary()->NotifyScreenUnlockCompleted();
+}
+
+void ScreenLocker::SetAuthenticator(Authenticator* authenticator) {
+  authenticator_ = authenticator;
+}
+
+void ScreenLocker::ScreenLockReady() {
+  DLOG(INFO) << "ScreenLockReady";
+  // Don't show the password field until we grab all inputs.
+  lock_widget_->GetRootView()->SetVisible(true);
+  EnableInput();
+  if (CrosLibrary::Get()->EnsureLoaded())
+    CrosLibrary::Get()->GetScreenLockLibrary()->NotifyScreenLockCompleted();
+}
+
+void ScreenLocker::OnMap(GtkWidget* widget, GdkEvent* event) {
+  DLOG(INFO) << "OnMap";
+  mapped_ = true;
+  if (input_grabbed_)
+    ScreenLockReady();
+}
+
 }  // namespace chromeos