Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1375)

Side by Side Diff: chrome/browser/extensions/extension_host_mac.mm

Issue 10837112: Add WebContents* to some more WebContentsDelegate methods (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 #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/view_type.h" 10 #include "chrome/common/view_type.h"
11 #include "content/public/browser/native_web_keyboard_event.h" 11 #include "content/public/browser/native_web_keyboard_event.h"
12 12
13 using content::NativeWebKeyboardEvent; 13 using content::NativeWebKeyboardEvent;
14 14
15 namespace extensions { 15 namespace extensions {
16 16
17 ExtensionHostMac::~ExtensionHostMac() { 17 ExtensionHostMac::~ExtensionHostMac() {
18 // If there is a popup open for this host's extension, close it. 18 // If there is a popup open for this host's extension, close it.
19 ExtensionPopupController* popup = [ExtensionPopupController popup]; 19 ExtensionPopupController* popup = [ExtensionPopupController popup];
20 if ([[popup window] isVisible] && 20 if ([[popup window] isVisible] &&
21 [popup extensionHost]->extension() == this->extension()) { 21 [popup extensionHost]->extension() == this->extension()) {
22 InfoBubbleWindow* window = (InfoBubbleWindow*)[popup window]; 22 InfoBubbleWindow* window = (InfoBubbleWindow*)[popup window];
23 [window setDelayOnClose:NO]; 23 [window setDelayOnClose:NO];
24 [popup close]; 24 [popup close];
25 } 25 }
26 } 26 }
27 27
28 void ExtensionHostMac::UnhandledKeyboardEvent( 28 void ExtensionHostMac::UnhandledKeyboardEvent(
29 content::WebContents* source,
29 const NativeWebKeyboardEvent& event) { 30 const NativeWebKeyboardEvent& event) {
30 if (event.skip_in_browser || event.type == NativeWebKeyboardEvent::Char || 31 if (event.skip_in_browser || event.type == NativeWebKeyboardEvent::Char ||
31 extension_host_type() != chrome::VIEW_TYPE_EXTENSION_POPUP) { 32 extension_host_type() != chrome::VIEW_TYPE_EXTENSION_POPUP) {
32 return; 33 return;
33 } 34 }
34 35
35 ChromeEventProcessingWindow* event_window = 36 ChromeEventProcessingWindow* event_window =
36 static_cast<ChromeEventProcessingWindow*>([view()->native_view() window]); 37 static_cast<ChromeEventProcessingWindow*>([view()->native_view() window]);
37 DCHECK([event_window isKindOfClass:[ChromeEventProcessingWindow class]]); 38 DCHECK([event_window isKindOfClass:[ChromeEventProcessingWindow class]]);
38 [event_window redispatchKeyEvent:event.os_event]; 39 [event_window redispatchKeyEvent:event.os_event];
39 } 40 }
40 41
41 } // namespace extensions 42 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_host_mac.h ('k') | chrome/browser/printing/print_preview_tab_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698