| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" | 5 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #import "chrome/browser/ui/cocoa/chrome_command_dispatcher_delegate.h" | 8 #import "chrome/browser/ui/cocoa/chrome_command_dispatcher_delegate.h" |
| 9 #import "ui/base/cocoa/user_interface_item_command_handler.h" | 9 #import "ui/base/cocoa/user_interface_item_command_handler.h" |
| 10 | 10 |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 [commandDispatcher_ setDelegate:commandDispatcherDelegate_]; | 30 [commandDispatcher_ setDelegate:commandDispatcherDelegate_]; |
| 31 } | 31 } |
| 32 return self; | 32 return self; |
| 33 } | 33 } |
| 34 | 34 |
| 35 - (BOOL)handleExtraKeyboardShortcut:(NSEvent*)event { | 35 - (BOOL)handleExtraKeyboardShortcut:(NSEvent*)event { |
| 36 return [commandDispatcherDelegate_ handleExtraKeyboardShortcut:event | 36 return [commandDispatcherDelegate_ handleExtraKeyboardShortcut:event |
| 37 window:self]; | 37 window:self]; |
| 38 } | 38 } |
| 39 | 39 |
| 40 - (BOOL)shouldHideFullscreenToolbar { |
| 41 return YES; |
| 42 } |
| 43 |
| 40 // CommandDispatchingWindow implementation. | 44 // CommandDispatchingWindow implementation. |
| 41 | 45 |
| 42 - (void)setCommandHandler:(id<UserInterfaceItemCommandHandler>)commandHandler { | 46 - (void)setCommandHandler:(id<UserInterfaceItemCommandHandler>)commandHandler { |
| 43 commandHandler_.reset([commandHandler retain]); | 47 commandHandler_.reset([commandHandler retain]); |
| 44 } | 48 } |
| 45 | 49 |
| 46 - (BOOL)redispatchKeyEvent:(NSEvent*)event { | 50 - (BOOL)redispatchKeyEvent:(NSEvent*)event { |
| 47 return [commandDispatcher_ redispatchKeyEvent:event]; | 51 return [commandDispatcher_ redispatchKeyEvent:event]; |
| 48 } | 52 } |
| 49 | 53 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 80 [item action] == @selector(commandDispatchUsingKeyModifiers:)) { | 84 [item action] == @selector(commandDispatchUsingKeyModifiers:)) { |
| 81 return commandHandler_ | 85 return commandHandler_ |
| 82 ? [commandHandler_ validateUserInterfaceItem:item window:self] | 86 ? [commandHandler_ validateUserInterfaceItem:item window:self] |
| 83 : [[NSApp delegate] validateUserInterfaceItem:item]; | 87 : [[NSApp delegate] validateUserInterfaceItem:item]; |
| 84 } | 88 } |
| 85 | 89 |
| 86 return [super validateUserInterfaceItem:item]; | 90 return [super validateUserInterfaceItem:item]; |
| 87 } | 91 } |
| 88 | 92 |
| 89 @end // ChromeEventProcessingWindow | 93 @end // ChromeEventProcessingWindow |
| OLD | NEW |