Ameliorate First Run Bubble race condition on XP

chrome/browser/views/first_run_bubble.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/views/first_run_bubble.h"
 
 #include "app/gfx/font_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/win_util.h"
@@ skipping 491 matching lines @@
 void FirstRunBubble::EnableParent() {
   ::EnableWindow(GetParent(), true);
   // Reactivate the FirstRunBubble so it responds to OnActivate messages.
   SetWindowPos(GetParent(), 0, 0, 0, 0,
                SWP_NOSIZE | SWP_NOMOVE | SWP_NOREDRAW | SWP_SHOWWINDOW);
 }
 
 void FirstRunBubble::OnActivate(UINT action, BOOL minimized, HWND window) {
   // Keep the bubble around for kLingerTime milliseconds, to prevent accidental
   // closure.
-  const int kLingerTime = 1000;
+  const int kLingerTime = 3000;
 
   // We might get re-enabled right before we are closed (sequence is: we get
   // deactivated, we call close, before we are actually closed we get
   // reactivated). Don't do the disabling of the parent in such cases.
   if (action == WA_ACTIVE && !has_been_activated_) {
     has_been_activated_ = true;
 
     ::EnableWindow(GetParent(), false);
 
     MessageLoop::current()->PostDelayedTask(FROM_HERE,
         enable_window_method_factory_.NewRunnableMethod(
             &FirstRunBubble::EnableParent),
         kLingerTime);
+    return;
   }
 
   // Keep window from automatically closing until kLingerTime has passed.
   if (::IsWindowEnabled(GetParent()))
     InfoBubble::OnActivate(action, minimized, window);
 }
 
 void FirstRunBubble::InfoBubbleClosing(InfoBubble* info_bubble,
                                        bool closed_by_escape) {
   // Make sure our parent window is re-enabled.
   if (!IsWindowEnabled(GetParent()))
     ::EnableWindow(GetParent(), true);
   enable_window_method_factory_.RevokeAll();
   GetFocusManager()->RemoveFocusChangeListener(view_);
 }