Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / extension_view_host_mac.mm

diff --git a/src/chrome/browser/extensions/extension_view_host_mac.mm b/src/chrome/browser/extensions/extension_view_host_mac.mm
index ee78305..5db8071 100644 (file)
--- a/src/chrome/browser/extensions/extension_view_host_mac.mm
+++ b/src/chrome/browser/extensions/extension_view_host_mac.mm
@@ -4,38 +4,22 @@
 
 #include "chrome/browser/extensions/extension_view_host_mac.h"
 
+#import "base/mac/foundation_util.h"
 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
-#include "content/public/browser/native_web_keyboard_event.h"
-
-using content::NativeWebKeyboardEvent;
 
 namespace extensions {
 
 ExtensionViewHostMac::~ExtensionViewHostMac() {
   // If there is a popup open for this host's extension, close it.
   ExtensionPopupController* popup = [ExtensionPopupController popup];
-  if ([[popup window] isVisible] &&
-      [popup extensionViewHost]->extension() == this->extension()) {
-    InfoBubbleWindow* window = (InfoBubbleWindow*)[popup window];
+  InfoBubbleWindow* window =
+      base::mac::ObjCCast<InfoBubbleWindow>([popup window]);
+  if ([window isVisible] && [popup extensionViewHost] == this) {
     [window setAllowedAnimations:info_bubble::kAnimateNone];
     [popup close];
   }
 }
 
-void ExtensionViewHostMac::UnhandledKeyboardEvent(
-    content::WebContents* source,
-    const NativeWebKeyboardEvent& event) {
-  if (event.skip_in_browser || event.type == NativeWebKeyboardEvent::Char ||
-      extension_host_type() != VIEW_TYPE_EXTENSION_POPUP) {
-    return;
-  }
-
-  ChromeEventProcessingWindow* event_window =
-      static_cast<ChromeEventProcessingWindow*>([view()->native_view() window]);
-  DCHECK([event_window isKindOfClass:[ChromeEventProcessingWindow class]]);
-  [event_window redispatchKeyEvent:event.os_event];
-}
-
 }  // namespace extensions