From e7ad932e9a04827ef75dc8c8975be25719ab9462 Mon Sep 17 00:00:00 2001 From: "ananta@chromium.org" Date: Mon, 2 Aug 2010 20:41:29 +0000 Subject: Fix ChromeFrame context menu tests which rely on the IE active document window having focus. This regressed recently with the change to fix focus recycling issues in ChromeFrame while switching tabs. Review URL: http://codereview.chromium.org/3067023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54596 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome_frame/chrome_active_document.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'chrome_frame/chrome_active_document.cc') diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc index 49439d9..bfd8e93 100644 --- a/chrome_frame/chrome_active_document.cc +++ b/chrome_frame/chrome_active_document.cc @@ -1219,6 +1219,7 @@ LRESULT ChromeActiveDocument::OnShowWindow(UINT message, WPARAM wparam, LRESULT ChromeActiveDocument::OnSetFocus(UINT message, WPARAM wparam, LPARAM lparam, BOOL& handled) { // NO_LINT - GiveFocusToChrome(false); + if (!ignore_setfocus_) + GiveFocusToChrome(false); return 0; } -- cgit v1.1