diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 14:46:38 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 14:46:38 +0000 |
| commit | f860d6032d2f561c76d377b1cade83697679fddb (patch) | |
| tree | 51d4831703596e090f071963ea962c4cf9a8b541 /chrome | |
| parent | 4de38a38c5eb01cf6bd11dcadc93edb99272a7da (diff) | |
| download | chromium_src-f860d6032d2f561c76d377b1cade83697679fddb.zip chromium_src-f860d6032d2f561c76d377b1cade83697679fddb.tar.gz chromium_src-f860d6032d2f561c76d377b1cade83697679fddb.tar.bz2 | |
Mac: disable minimize in fullscreen mode.
If it's set (in System Prefs) to minimize windows on double-click (on the title
bar), double-clicking on the blank area of the floating bar will beep.
BUG=37972
TEST=Make sure Minimize is disabled in the Window menu, Cmd-M shouldn't work, and double-clicking on the blank area of the floating bar shouldn't minimize (it should beep if System Prefs is set as described above).
Review URL: http://codereview.chromium.org/862007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/cocoa/floating_bar_backing_view.mm | 3 | ||||
| -rw-r--r-- | chrome/browser/cocoa/fullscreen_window.mm | 9 |
2 files changed, 2 insertions, 10 deletions
diff --git a/chrome/browser/cocoa/floating_bar_backing_view.mm b/chrome/browser/cocoa/floating_bar_backing_view.mm index 8df204f..5d67e47 100644 --- a/chrome/browser/cocoa/floating_bar_backing_view.mm +++ b/chrome/browser/cocoa/floating_bar_backing_view.mm @@ -37,7 +37,8 @@ // Eat this too, except that ... - (void)mouseUp:(NSEvent*)event { - // a double-click in the blank area should minimize. + // a double-click in the blank area should try to minimize, to be consistent + // with double-clicks on the contiguous tab strip area. (It'll fail and beep.) if ([event clickCount] == 2 && mac_util::ShouldWindowsMiniaturizeOnDoubleClick()) [[self window] performMiniaturize:self]; diff --git a/chrome/browser/cocoa/fullscreen_window.mm b/chrome/browser/cocoa/fullscreen_window.mm index dd94c6b..9251aa8 100644 --- a/chrome/browser/cocoa/fullscreen_window.mm +++ b/chrome/browser/cocoa/fullscreen_window.mm @@ -71,11 +71,6 @@ } } -// Similarly, we need this too.... -- (void)performMiniaturize:(id)sender { - [self miniaturize:sender]; -} - - (BOOL)validateUserInterfaceItem:(id<NSValidatedUserInterfaceItem>)item { SEL action = [item action]; @@ -84,10 +79,6 @@ if (action == @selector(performClose:)) return YES; - // Similarly for |-performMiniaturize:|. - if (action == @selector(performMiniaturize:)) - return YES; - return [super validateUserInterfaceItem:item]; } |