OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/extensions/extension_host_mac.h" | 5 #include "chrome/browser/extensions/extension_host_mac.h" |
6 | 6 |
7 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" | 7 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" |
8 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" | 8 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" |
9 #import "chrome/browser/ui/cocoa/info_bubble_window.h" | 9 #import "chrome/browser/ui/cocoa/info_bubble_window.h" |
10 #include "chrome/common/chrome_view_types.h" | 10 #include "chrome/common/chrome_view_type.h" |
11 #include "content/browser/renderer_host/render_widget_host_view_mac.h" | 11 #include "content/browser/renderer_host/render_widget_host_view_mac.h" |
12 #include "content/public/browser/native_web_keyboard_event.h" | 12 #include "content/public/browser/native_web_keyboard_event.h" |
13 | 13 |
14 ExtensionHostMac::~ExtensionHostMac() { | 14 ExtensionHostMac::~ExtensionHostMac() { |
15 // If there is a popup open for this host's extension, close it. | 15 // If there is a popup open for this host's extension, close it. |
16 ExtensionPopupController* popup = [ExtensionPopupController popup]; | 16 ExtensionPopupController* popup = [ExtensionPopupController popup]; |
17 if ([[popup window] isVisible] && | 17 if ([[popup window] isVisible] && |
18 [popup extensionHost]->extension() == this->extension()) { | 18 [popup extensionHost]->extension() == this->extension()) { |
19 InfoBubbleWindow* window = (InfoBubbleWindow*)[popup window]; | 19 InfoBubbleWindow* window = (InfoBubbleWindow*)[popup window]; |
20 [window setDelayOnClose:NO]; | 20 [window setDelayOnClose:NO]; |
21 [popup close]; | 21 [popup close]; |
22 } | 22 } |
23 } | 23 } |
24 | 24 |
25 void ExtensionHostMac::UnhandledKeyboardEvent( | 25 void ExtensionHostMac::UnhandledKeyboardEvent( |
26 const NativeWebKeyboardEvent& event) { | 26 const NativeWebKeyboardEvent& event) { |
27 if (event.skip_in_browser || event.type == NativeWebKeyboardEvent::Char || | 27 if (event.skip_in_browser || event.type == NativeWebKeyboardEvent::Char || |
28 extension_host_type() != chrome::VIEW_TYPE_EXTENSION_POPUP) { | 28 extension_host_type() != chrome::VIEW_TYPE_EXTENSION_POPUP) { |
29 return; | 29 return; |
30 } | 30 } |
31 | 31 |
32 ChromeEventProcessingWindow* event_window = | 32 ChromeEventProcessingWindow* event_window = |
33 static_cast<ChromeEventProcessingWindow*>([view()->native_view() window]); | 33 static_cast<ChromeEventProcessingWindow*>([view()->native_view() window]); |
34 DCHECK([event_window isKindOfClass:[ChromeEventProcessingWindow class]]); | 34 DCHECK([event_window isKindOfClass:[ChromeEventProcessingWindow class]]); |
35 [event_window redispatchKeyEvent:event.os_event]; | 35 [event_window redispatchKeyEvent:event.os_event]; |
36 } | 36 } |
OLD | NEW |