Index: chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm |
diff --git a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm |
index 99bf80111a97032adcceac299bfa1427440b539c..be007c7abd735cb8f39de971b757b820d67e2078 100644 |
--- a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm |
+++ b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_delegate.mm |
@@ -16,6 +16,8 @@ |
#include "chrome/browser/ui/browser_commands.h" |
#include "chrome/browser/ui/browser_finder.h" |
#import "chrome/browser/ui/cocoa/browser_window_controller.h" |
+#import "chrome/browser/ui/cocoa/system_hotkey_helper_mac.h" |
+#import "chrome/browser/ui/cocoa/system_hotkey_map.h" |
#import "chrome/browser/ui/cocoa/view_id_util.h" |
#include "chrome/common/pref_names.h" |
#include "chrome/common/spellcheck_messages.h" |
@@ -198,6 +200,11 @@ class SpellCheckObserver : public content::WebContentsObserver { |
[historySwiper_ rendererHandledWheelEvent:event consumed:consumed]; |
} |
+- (BOOL)eventIsReservedBySystem:(NSEvent*)event { |
+ SystemHotkeyHelperMac* helper = SystemHotkeyHelperMac::GetInstance(); |
+ return helper->map()->IsEventReserved(event); |
+} |
+ |
// Spellchecking methods |
// The next five methods are implemented here since this class is the first |
// responder for anything in the browser. |