First batch of context menu tests

Refactored various methods to send keyboard and mouse
input. Fixed the context menu focus issue on IE7.
Improved existing tests to make them less flaky and
added 3 new tests for context menu items.


BUG=34673
TEST=new tests added


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

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

1 files changed, 10 insertions, 3 deletions

diff --git a/chrome_frame/chrome_frame_plugin.h b/chrome_frame/chrome_frame_plugin.h
index 0e16001..293cb99 100644
--- a/chrome_frame/chrome_frame_plugin.h
+++ b/chrome_frame/chrome_frame_plugin.h
@@ -107,12 +107,19 @@ END_MSG_MAP()
     if (!copy)
       return;
 
-    T* pThis = static_cast<T*>(this);
-    if (pThis->PreProcessContextMenu(copy)) {
+    T* self = static_cast<T*>(this);
+    if (self->PreProcessContextMenu(copy)) {
+      // In order for the context menu to handle keyboard input, give the
+      // ActiveX window focus.
+      ignore_setfocus_ = true;
+      SetFocus(GetWindow());
+      ignore_setfocus_ = false;
       UINT flags = align_flags | TPM_LEFTBUTTON | TPM_RETURNCMD | TPM_RECURSE;
       UINT selected = TrackPopupMenuEx(copy, flags, params.screen_x,
                                        params.screen_y, GetWindow(), NULL);
-      if (selected != 0 && !pThis->HandleContextMenuCommand(selected, params)) {
+      // Menu is over now give focus back to chrome
+      GiveFocusToChrome();
+      if (selected != 0 && !self->HandleContextMenuCommand(selected, params)) {
         automation_client_->SendContextMenuCommandToChromeFrame(selected);
       }
     }