OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "app/l10n_util_mac.h" | 5 #include "app/l10n_util_mac.h" |
6 #include "base/gfx/rect.h" | 6 #include "base/gfx/rect.h" |
7 #include "base/keyboard_codes.h" | 7 #include "base/keyboard_codes.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/sys_string_conversions.h" | 9 #include "base/sys_string_conversions.h" |
10 #include "chrome/app/chrome_dll_resource.h" | 10 #include "chrome/app/chrome_dll_resource.h" |
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
479 // binding. Other than that, the |redispatchEvent| call would take care of | 479 // binding. Other than that, the |redispatchEvent| call would take care of |
480 // invoking the original menu item shortcut as well. | 480 // invoking the original menu item shortcut as well. |
481 if ([[NSApp mainMenu] performKeyEquivalent:event]) | 481 if ([[NSApp mainMenu] performKeyEquivalent:event]) |
482 return true; | 482 return true; |
483 | 483 |
484 if ([event_window handleExtraBrowserKeyboardShortcut:event]) | 484 if ([event_window handleExtraBrowserKeyboardShortcut:event]) |
485 return true; | 485 return true; |
486 | 486 |
487 if ([event_window handleExtraWindowKeyboardShortcut:event]) | 487 if ([event_window handleExtraWindowKeyboardShortcut:event]) |
488 return true; | 488 return true; |
| 489 |
| 490 if ([event_window handleDelayedWindowKeyboardShortcut:event]) |
| 491 return true; |
489 } | 492 } |
490 | 493 |
491 return [event_window redispatchEvent:event]; | 494 return [event_window redispatchEvent:event]; |
492 } | 495 } |
493 | 496 |
494 void BrowserWindowCocoa::ShowCreateShortcutsDialog(TabContents* tab_contents) { | 497 void BrowserWindowCocoa::ShowCreateShortcutsDialog(TabContents* tab_contents) { |
495 NOTIMPLEMENTED(); | 498 NOTIMPLEMENTED(); |
496 } | 499 } |
497 | 500 |
498 void BrowserWindowCocoa::Observe(NotificationType type, | 501 void BrowserWindowCocoa::Observe(NotificationType type, |
(...skipping 10 matching lines...) Expand all Loading... |
509 break; | 512 break; |
510 } | 513 } |
511 } | 514 } |
512 | 515 |
513 void BrowserWindowCocoa::DestroyBrowser() { | 516 void BrowserWindowCocoa::DestroyBrowser() { |
514 [controller_ destroyBrowser]; | 517 [controller_ destroyBrowser]; |
515 | 518 |
516 // at this point the controller is dead (autoreleased), so | 519 // at this point the controller is dead (autoreleased), so |
517 // make sure we don't try to reference it any more. | 520 // make sure we don't try to reference it any more. |
518 } | 521 } |
OLD | NEW |