summaryrefslogtreecommitdiffstats
path: root/chrome/views
diff options
context:
space:
mode:
authorsky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-17 22:47:53 +0000
committersky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-17 22:47:53 +0000
commit4b32ec16a42cc947ecef5f9f185c20e96fd6b6d3 (patch)
treecec80942545cb6bf5455c9e7be0ade8f9508b4a3 /chrome/views
parent3acfbd20fb06a44ae39a884b0179b03229602bcc (diff)
downloadchromium_src-4b32ec16a42cc947ecef5f9f185c20e96fd6b6d3.zip
chromium_src-4b32ec16a42cc947ecef5f9f185c20e96fd6b6d3.tar.gz
chromium_src-4b32ec16a42cc947ecef5f9f185c20e96fd6b6d3.tar.bz2
Changes menu's Dispatcher to translate/dispatch message before
returning false. This way we don't screw up the message pump. I also needed to slightly tweak the bookmark bar test that was hitting this code path. BUG=none TEST=none Review URL: http://codereview.chromium.org/15008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7177 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views')
-rw-r--r--chrome/views/chrome_menu.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/views/chrome_menu.cc b/chrome/views/chrome_menu.cc
index 309109a..6b1483c 100644
--- a/chrome/views/chrome_menu.cc
+++ b/chrome/views/chrome_menu.cc
@@ -2058,8 +2058,13 @@ void MenuController::SetActiveInstance(MenuController* controller) {
bool MenuController::Dispatch(const MSG& msg) {
DCHECK(blocking_run_);
- if (exit_all_)
+ if (exit_all_) {
+ // We must translate/dispatch the message here, otherwise we would drop
+ // the message on the floor.
+ TranslateMessage(&msg);
+ DispatchMessage(&msg);
return false;
+ }
// NOTE: we don't get WM_ACTIVATE or anything else interesting in here.
switch (msg.message) {