summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-19 14:11:51 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-19 14:11:51 +0000
commite72746b145ffb989afedc91e7a16c22a233401b5 (patch)
tree5ad7e6ea38d62c91476e2c172965e0577bfbcb43
parent00d90288e64096ac8a21725033f19270c7c2fea0 (diff)
downloadchromium_src-e72746b145ffb989afedc91e7a16c22a233401b5.zip
chromium_src-e72746b145ffb989afedc91e7a16c22a233401b5.tar.gz
chromium_src-e72746b145ffb989afedc91e7a16c22a233401b5.tar.bz2
Don't delay menu item fixup when the number of tabs change.
BUG=24878 TEST=cmd-w/cmd-shift-w are always correct for close-tab/close-window when window layering changes. Review URL: http://codereview.chromium.org/283017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29397 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/app_controller_mac.mm6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index bf35e93..edf3615 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -271,7 +271,11 @@
// Called when the number of tabs changes in one of the browser windows. The
// object is the tab strip controller, but we don't currently care.
- (void)tabsChanged:(NSNotification*)notify {
- [self delayedFixCloseMenuItemKeyEquivalents];
+ // We don't need to do this on a delay, as in the method above, because the
+ // window layering isn't changing. As a result, there's no chance that a
+ // different window will sneak in as the key window and cause the problems
+ // we hacked around above by clearing the key equivalents.
+ [self fixCloseMenuItemKeyEquivalents];
}
// If the auto-update interval is not set, make it 5 hours.