summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-11 00:34:17 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-11 00:34:17 +0000
commit107d976cd48b004d0f220da154db609457ab903b (patch)
treecf1137b76b1e4cd533ff9a971f83080dd04ecac2 /chrome/browser/views
parent6689dbbb7832c151d6d846b6ed55445a6c979f20 (diff)
downloadchromium_src-107d976cd48b004d0f220da154db609457ab903b.zip
chromium_src-107d976cd48b004d0f220da154db609457ab903b.tar.gz
chromium_src-107d976cd48b004d0f220da154db609457ab903b.tar.bz2
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
Diffstat (limited to 'chrome/browser/views')
-rw-r--r--chrome/browser/views/frame/browser_view.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index e1fbe6a..85b8999 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -1050,6 +1050,8 @@ void BrowserView::TabSelectedAt(TabContents* old_contents,
// We only restore focus if our window is visible, to avoid invoking blur
// handlers when we are eventually shown.
new_contents->view()->RestoreFocus();
+ if (new_contents->find_ui_active())
+ browser_->find_bar()->find_bar()->SetFocusAndSelection();
}
// Update all the UI bits.