diff options
author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-07 23:53:51 +0000 |
---|---|---|
committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-07 23:53:51 +0000 |
commit | 01c022ac4ee3ba1c3840544f3493cf0690e03125 (patch) | |
tree | d766d13e66261240e6393ceb7b601ea0c24d1706 /chrome/browser/cocoa/chrome_browser_window.mm | |
parent | 28d0c9c14970a0e1c3c6dcc0746529446c692393 (diff) | |
download | chromium_src-01c022ac4ee3ba1c3840544f3493cf0690e03125.zip chromium_src-01c022ac4ee3ba1c3840544f3493cf0690e03125.tar.gz chromium_src-01c022ac4ee3ba1c3840544f3493cf0690e03125.tar.bz2 |
[Mac] Window titles for Expose.
http://crbug.com/18854
TEST=Titles on mouse-over in Expose. No extra title in titlebar.
Review URL: http://codereview.chromium.org/259023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28350 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/chrome_browser_window.mm')
-rw-r--r-- | chrome/browser/cocoa/chrome_browser_window.mm | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/chrome_browser_window.mm b/chrome/browser/cocoa/chrome_browser_window.mm new file mode 100644 index 0000000..4f2f859 --- /dev/null +++ b/chrome/browser/cocoa/chrome_browser_window.mm @@ -0,0 +1,46 @@ +// Copyright (c) 2009 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. + +#import "chrome/browser/cocoa/chrome_browser_window.h" + +#include "base/logging.h" +#import "chrome/browser/cocoa/browser_window_controller.h" +#include "chrome/browser/global_keyboard_shortcuts_mac.h" + +@implementation ChromeBrowserWindow + +- (BOOL)performKeyEquivalent:(NSEvent*)event { + // Extract info from |event|. + NSUInteger modifers = [event modifierFlags]; + const bool cmdKey = modifers & NSCommandKeyMask; + const bool shiftKey = modifers & NSShiftKeyMask; + const bool cntrlKey = modifers & NSControlKeyMask; + const int keyCode = [event keyCode]; + + int cmdNum = CommandForKeyboardShortcut(cmdKey, shiftKey, cntrlKey, + keyCode); + + BrowserWindowController* controller = + (BrowserWindowController*)[self delegate]; + // A bit of sanity. + DCHECK([controller isKindOfClass:[BrowserWindowController class]]); + DCHECK([controller respondsToSelector:@selector(executeCommand:)]); + + if (cmdNum != -1) { + [controller executeCommand:cmdNum]; + return YES; + } + + return [super performKeyEquivalent:event]; +} + +- (void)setShouldHideTitle:(BOOL)flag { + shouldHideTitle_ = flag; +} + +-(BOOL)_isTitleHidden { + return shouldHideTitle_; +} + +@end |