diff options
Diffstat (limited to 'chrome/browser/automation')
| -rw-r--r-- | chrome/browser/automation/automation_provider_win.cc | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/chrome/browser/automation/automation_provider_win.cc b/chrome/browser/automation/automation_provider_win.cc index 3495991..86dfec1 100644 --- a/chrome/browser/automation/automation_provider_win.cc +++ b/chrome/browser/automation/automation_provider_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -24,6 +24,7 @@ #include "chrome/browser/views/bookmark_bar_view.h" #include "chrome/common/page_zoom.h" #include "chrome/test/automation/automation_messages.h" +#include "views/focus/accelerator_handler.h" #include "views/widget/root_view.h" #include "views/widget/widget_win.h" #include "views/window/window.h" @@ -199,15 +200,23 @@ void AutomationProvider::WindowSimulateDrag(int handle, MoveMouse(end); if (press_escape_en_route) { - // Press Escape. - ui_controls::SendKeyPress(window, app::VKEY_ESCAPE, - ((flags & views::Event::EF_CONTROL_DOWN) - == views::Event::EF_CONTROL_DOWN), - ((flags & views::Event::EF_SHIFT_DOWN) == - views::Event::EF_SHIFT_DOWN), - ((flags & views::Event::EF_ALT_DOWN) == - views::Event::EF_ALT_DOWN), - false); + // Press Escape, making sure we wait until chrome processes the escape. + // TODO(phajdan.jr): make this use ui_test_utils::SendKeyPressSync. + ui_controls::SendKeyPressNotifyWhenDone( + window, app::VKEY_ESCAPE, + ((flags & views::Event::EF_CONTROL_DOWN) == + views::Event::EF_CONTROL_DOWN), + ((flags & views::Event::EF_SHIFT_DOWN) == + views::Event::EF_SHIFT_DOWN), + ((flags & views::Event::EF_ALT_DOWN) == views::Event::EF_ALT_DOWN), + false, + new MessageLoop::QuitTask()); + MessageLoopForUI* loop = MessageLoopForUI::current(); + bool did_allow_task_nesting = loop->NestableTasksAllowed(); + loop->SetNestableTasksAllowed(true); + views::AcceleratorHandler handler; + loop->Run(&handler); + loop->SetNestableTasksAllowed(did_allow_task_nesting); } SendMessage(top_level_hwnd, up_message, wparam_flags, MAKELPARAM(end.x, end.y)); |