diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-02 20:41:29 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-02 20:41:29 +0000 |
| commit | e7ad932e9a04827ef75dc8c8975be25719ab9462 (patch) | |
| tree | 422f09811a4cf596a80a6f5ce20ffb544e4b27a9 /chrome_frame/chrome_active_document.cc | |
| parent | 59295e47561b4b31ef9a111ea930e06ae8c5478e (diff) | |
| download | chromium_src-e7ad932e9a04827ef75dc8c8975be25719ab9462.zip chromium_src-e7ad932e9a04827ef75dc8c8975be25719ab9462.tar.gz chromium_src-e7ad932e9a04827ef75dc8c8975be25719ab9462.tar.bz2 | |
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
Diffstat (limited to 'chrome_frame/chrome_active_document.cc')
| -rw-r--r-- | chrome_frame/chrome_active_document.cc | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |