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

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

Issue 10961066: Revert 158199 - extensions: Add ExtensionView interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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
« no previous file with comments | « chrome/browser/extensions/extension_host.cc ('k') | chrome/browser/extensions/extension_view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Deleted: svn:mergeinfo
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 #include "chrome/browser/extensions/extension_view.h"
8 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" 7 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
9 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" 8 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
10 #import "chrome/browser/ui/cocoa/info_bubble_window.h" 9 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
11 #include "chrome/common/view_type.h" 10 #include "chrome/common/view_type.h"
12 #include "content/public/browser/native_web_keyboard_event.h" 11 #include "content/public/browser/native_web_keyboard_event.h"
13 12
14 using content::NativeWebKeyboardEvent; 13 using content::NativeWebKeyboardEvent;
15 14
16 namespace extensions { 15 namespace extensions {
17 16
(...skipping 10 matching lines...) Expand all
28 27
29 void ExtensionHostMac::UnhandledKeyboardEvent( 28 void ExtensionHostMac::UnhandledKeyboardEvent(
30 content::WebContents* source, 29 content::WebContents* source,
31 const NativeWebKeyboardEvent& event) { 30 const NativeWebKeyboardEvent& event) {
32 if (event.skip_in_browser || event.type == NativeWebKeyboardEvent::Char || 31 if (event.skip_in_browser || event.type == NativeWebKeyboardEvent::Char ||
33 extension_host_type() != chrome::VIEW_TYPE_EXTENSION_POPUP) { 32 extension_host_type() != chrome::VIEW_TYPE_EXTENSION_POPUP) {
34 return; 33 return;
35 } 34 }
36 35
37 ChromeEventProcessingWindow* event_window = 36 ChromeEventProcessingWindow* event_window =
38 static_cast<ChromeEventProcessingWindow*>( 37 static_cast<ChromeEventProcessingWindow*>([view()->native_view() window]);
39 [GetExtensionView()->GetNativeView() window]);
40 DCHECK([event_window isKindOfClass:[ChromeEventProcessingWindow class]]); 38 DCHECK([event_window isKindOfClass:[ChromeEventProcessingWindow class]]);
41 [event_window redispatchKeyEvent:event.os_event]; 39 [event_window redispatchKeyEvent:event.os_event];
42 } 40 }
43 41
44 } // namespace extensions 42 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_host.cc ('k') | chrome/browser/extensions/extension_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698