diff options
| author | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-18 20:11:56 +0000 |
|---|---|---|
| committer | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-18 20:11:56 +0000 |
| commit | ebbe94b785d1e18ef34f7cc5db026bbb7cba9adb (patch) | |
| tree | 2ea94ce4b815c0f965e6dbe7b59523b18ddf41fb /chrome/browser/app_controller_mac.h | |
| parent | f2a9e3f812d05f0ac61cbae4b5e911f29913c9b2 (diff) | |
| download | chromium_src-ebbe94b785d1e18ef34f7cc5db026bbb7cba9adb.zip chromium_src-ebbe94b785d1e18ef34f7cc5db026bbb7cba9adb.tar.gz chromium_src-ebbe94b785d1e18ef34f7cc5db026bbb7cba9adb.tar.bz2 | |
Better fix for Lion dictionary popover cmd-W bug.
This reverts http://crrev.com/117681 and http://crrev.com/104931 and instead uses new 10.7 notifications to change the shortcuts on Close Tab and Close Window items, so that cmd-W does a "Close Window" when the dictionary is open.
The above is also how Safari appears to solve this issue, as can be seen by going to the File menu when the dictionary popover is up.
BUG=104931, 110306, 109061
TEST=1. Open a tab and double 3-finger tap on a word to bring up the
dictionary popup. Hit cmd-W. The popup should close but the tab
should stay open. Hit cmd-W again. The tab should close.
2. Try cmd-shift-W with > 1 tab open. The window should close.
3. Open a window that doesn't have tabs (e.g. Chrome -> About
Chrome). File -> Close Tab should be disabled.
Review URL: http://codereview.chromium.org/9230011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118131 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/app_controller_mac.h')
| -rw-r--r-- | chrome/browser/app_controller_mac.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/app_controller_mac.h b/chrome/browser/app_controller_mac.h index e32e478..b780071 100644 --- a/chrome/browser/app_controller_mac.h +++ b/chrome/browser/app_controller_mac.h @@ -63,14 +63,14 @@ class Profile; // Outlet for the tabpose menu item so we can hide it. IBOutlet NSMenuItem* tabposeMenuItem_; + + // Indicates wheter an NSPopover is currently being shown. + BOOL hasPopover_; } @property(readonly, nonatomic) BOOL startupComplete; @property(readonly, nonatomic) Profile* lastProfile; -// Registers for various event handlers and performs initialization. -- (void)registerEventHandlersAndInitialize; - - (void)didEndMainMessageLoop; // Try to close all browser windows, and if that succeeds then quit. |