Make sure we don't set focus to the findbar until after the focus is restored to the tab contents.

BUG=18294

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

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

1 files changed, 4 insertions, 2 deletions

diff --git a/chrome/browser/cocoa/tab_strip_controller.h b/chrome/browser/cocoa/tab_strip_controller.h
index 0a5308d..ead599e 100644
--- a/chrome/browser/cocoa/tab_strip_controller.h
+++ b/chrome/browser/cocoa/tab_strip_controller.h
@@ -14,6 +14,7 @@
 @class TabView;
 @class TabStripView;
 
+class Browser;
 class TabStripModelObserverBridge;
 class TabStripModel;
 class TabContents;
@@ -38,6 +39,7 @@ class ToolbarModel;
   scoped_nsobject<NSView> dragBlockingView_;  // avoid bad window server drags
   NSButton* newTabButton_;  // weak, obtained from the nib.
   scoped_ptr<TabStripModelObserverBridge> bridge_;
+  Browser* browser_;  // weak
   TabStripModel* tabModel_;  // weak
   // access to the TabContentsControllers (which own the parent view
   // for the toolbar and associated tab contents) given an index. This needs
@@ -49,7 +51,7 @@ class ToolbarModel;
   scoped_nsobject<NSMutableArray> tabArray_;
 
   // These values are only used during a drag, and override tab positioning.
-  TabView* placeholderTab_; // weak. Tab being dragged
+  TabView* placeholderTab_;  // weak. Tab being dragged
   NSRect placeholderFrame_;  // Frame to use
   CGFloat placeholderStretchiness_; // Vertical force shown by streching tab.
   // Frame targets for all the current views.
@@ -84,7 +86,7 @@ class ToolbarModel;
 // you have retained them.
 - (id)initWithView:(TabStripView*)view
         switchView:(NSView*)switchView
-             model:(TabStripModel*)model;
+           browser:(Browser*)browser;
 
 // Return the view for the currently selected tab.
 - (NSView *)selectedTabView;