Reverting 26219.

chrome/browser/cocoa/find_bar_cocoa_controller.mm

 // Copyright (c) 2009 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "app/l10n_util.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "grit/generated_resources.h"
 #include "chrome/browser/find_bar_controller.h"
 #include "chrome/browser/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/cocoa/find_bar_cocoa_controller.h"
 #import "chrome/browser/cocoa/find_bar_bridge.h"
+#import "chrome/browser/cocoa/focus_tracker.h"
 #import "chrome/browser/cocoa/tab_strip_controller.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 
 @implementation FindBarCocoaController
 
 - (id)init {
   if ((self = [super initWithNibName:@"FindBar"
                               bundle:mac_util::MainAppBundle()])) {
   }
   return self;
@@ skipping 88 matching lines @@
 
     return YES;
   }
 
   return NO;
 }
 
 // Methods from FindBar
 - (void)showFindBar {
   [[self view] setHidden:NO];
+
+  // Save the currently-focused view.  |[self view]| is in the view
+  // hierarchy by now.  showFindBar can be called even when the
+  // findbar is already open, so do not overwrite an already saved
+  // view.
+  if (!focusTracker_.get())
+    focusTracker_.reset(
+        [[FocusTracker alloc] initWithWindow:[[self view] window]]);
 }
 
 - (void)hideFindBar {
   [[self view] setHidden:YES];
 }
 
 - (void)setFocusAndSelection {
   [[findText_ window] makeFirstResponder:findText_];
 
   // Enable the buttons if the find text is non-empty.
   BOOL buttonsEnabled = ([[findText_ stringValue] length] > 0) ? YES : NO;
   [previousButton_ setEnabled:buttonsEnabled];
   [nextButton_ setEnabled:buttonsEnabled];
 
 }
 
+- (void)restoreSavedFocus {
+  if (!(focusTracker_.get() &&
+        [focusTracker_ restoreFocusInWindow:[[self view] window]])) {
+    // Fall back to giving focus to the tab contents.
+    findBarBridge_->GetFindBarController()->tab_contents()->Focus();
+  }
+  focusTracker_.reset(nil);
+}
+
 - (void)setFindText:(const string16&)findText {
   [findText_ setStringValue:base::SysUTF16ToNSString(findText)];
 }
 
 - (void)clearResults:(const FindNotificationDetails&)results {
   // Just call updateUIForFindResult, which will take care of clearing
   // the search text and the results label.
   [self updateUIForFindResult:results withText:string16()];
 }
 
@@ skipping 21 matching lines @@
     [resultsLabel_ setStringValue:base::SysWideToNSString(
           l10n_util::GetStringF(IDS_FIND_IN_PAGE_COUNT,
                                 IntToWString(result.active_match_ordinal()),
                                 IntToWString(result.number_of_matches())))];
   } else {
     // If there was no text entered, we don't show anything in the result count
     // area.
     [resultsLabel_ setStringValue:@""];
   }
 
+  // If we found any results, reset the focus tracker, so we always
+  // restore focus to the tab contents.
+  if (result.number_of_matches() > 0)
+    focusTracker_.reset(nil);
+
   // Resize |resultsLabel_| to completely contain its string and right-justify
   // it within |findText_|.  sizeToFit may shrink the frame vertically, which we
   // don't want, so we save the original vertical positioning.
   NSRect labelFrame = [resultsLabel_ frame];
   [resultsLabel_ sizeToFit];
   labelFrame.size.width = [resultsLabel_ frame].size.width;
   labelFrame.origin.x = NSMaxX([findText_ frame]) - labelFrame.size.width;
   [resultsLabel_ setFrame:labelFrame];
 
   // TODO(rohitrao): If the search string is too long, then it will overlap with
   // the results label.  Fix.
 }
 
 - (BOOL)isFindBarVisible {
   return [[self view] isHidden] ? NO : YES;
 }
 
 @end