Mac: Try to make sure that the first run bubble always disappears.

BUG=52726
TEST=The first run bubble should work as before for normal people. For deepakg, it should no longer stick around forever.

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

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

1 files changed, 22 insertions, 0 deletions

diff --git a/chrome/browser/cocoa/first_run_bubble_controller.mm b/chrome/browser/cocoa/first_run_bubble_controller.mm
index 6c4ea32..0469eee 100644
--- a/chrome/browser/cocoa/first_run_bubble_controller.mm
+++ b/chrome/browser/cocoa/first_run_bubble_controller.mm
@@ -16,6 +16,7 @@
 - (id)initRelativeToView:(NSView*)view
                   offset:(NSPoint)offset
                  profile:(Profile*)profile;
+- (void)closeIfNotKey;
 @end
 
 @implementation FirstRunBubbleController
@@ -37,6 +38,13 @@
                                     offset:offset])) {
     profile_ = profile;
     [self showWindow:nil];
+
+    // On 10.5, the first run bubble sometimes does not disappear when clicking
+    // the omnibox. This happens if the bubble never became key, due to it
+    // showing up so early in the startup sequence. As a workaround, close it
+    // automatically after a few seconds if it doesn't become key.
+    // http://crbug.com/52726
+    [self performSelector:@selector(closeIfNotKey) withObject:nil afterDelay:3];
   }
   return self;
 }
@@ -59,4 +67,18 @@
   [[self window] setFrame:frame display:YES];
 }
 
+- (void)close {
+  // If the window is closed before the timer is fired, cancel the timer, since
+  // it retains the controller.
+  [NSObject cancelPreviousPerformRequestsWithTarget:self
+                                           selector:@selector(closeIfNotKey)
+                                             object:nil];
+  [super close];
+}
+
+- (void)closeIfNotKey {
+  if (![[self window] isKeyWindow])
+    [self close];
+}
+
 @end  // FirstRunBubbleController