Allow permission bubbles to participate in key event dispatch as if they were a Browser.

chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h"
 
 #include <algorithm>
 
 #include "base/mac/bind_objc_block.h"
 #include "base/macros.h"
@@ skipping 124 matching lines @@
   CGFloat maxTitleWidth = 0;
   for (NSMenuItem* item in [self itemArray]) {
     NSSize size = SizeForWebsiteSettingsButtonTitle(self, [item title]);
     maxTitleWidth = std::max(maxTitleWidth, size.width);
   }
   return maxTitleWidth;
 }
 
 @end
 
-// The window used for the permission bubble controller.
-// Subclassed to allow browser-handled keyboard events to be passed from the
-// permission bubble to its parent window, which is a browser window.
-@interface PermissionBubbleWindow : InfoBubbleWindow
-@end
-
-@implementation PermissionBubbleWindow
-- (BOOL)performKeyEquivalent:(NSEvent*)event {
-  // Before forwarding to parent, handle locally.
-  if ([super performKeyEquivalent:event])
-    return YES;
-
-  // Only handle events if they should be forwarded to the parent window.
-  if ([self allowShareParentKeyState]) {
-    content::NativeWebKeyboardEvent wrappedEvent(event);
-    if ([BrowserWindowUtils shouldHandleKeyboardEvent:wrappedEvent]) {
-      // Turn off sharing of key window state while the keyboard event is
-      // processed.  This avoids recursion - with the key window state shared,
-      // the parent window would just forward the event back to this class.
-      [self setAllowShareParentKeyState:NO];
-      BOOL eventHandled =
-          [BrowserWindowUtils handleKeyboardEvent:event
-                                         inWindow:[self parentWindow]];
-      [self setAllowShareParentKeyState:YES];
-      return eventHandled;
-    }
-  }
-  return NO;
-}
-@end
-
 @interface PermissionBubbleController ()
 
 // Determines if the bubble has an anchor in a corner or no anchor at all.
 - (info_bubble::BubbleArrowLocation)getExpectedArrowLocation;
 
 // Returns the expected parent for this bubble.
 - (NSWindow*)getExpectedParentWindow;
 
 // Returns an autoreleased NSView displaying the icon and label for |request|.
 - (NSView*)labelForRequest:(PermissionRequest*)request;
@@ skipping 46 matching lines @@
 - (IBAction)cancel:(id)sender;
 
 @end
 
 @implementation PermissionBubbleController
 
 - (id)initWithBrowser:(Browser*)browser bridge:(PermissionBubbleCocoa*)bridge {
   DCHECK(browser);
   DCHECK(bridge);
   browser_ = browser;
-  base::scoped_nsobject<PermissionBubbleWindow> window(
-      [[PermissionBubbleWindow alloc]
-          initWithContentRect:ui::kWindowSizeDeterminedLater
-                    styleMask:NSBorderlessWindowMask
-                      backing:NSBackingStoreBuffered
-                        defer:NO]);
+  base::scoped_nsobject<InfoBubbleWindow> window([[InfoBubbleWindow alloc]
+      initWithContentRect:ui::kWindowSizeDeterminedLater
+                styleMask:NSBorderlessWindowMask
+                  backing:NSBackingStoreBuffered
+                    defer:NO]);
+
   [window setAllowedAnimations:info_bubble::kAnimateNone];
   [window setReleasedWhenClosed:NO];
   if ((self = [super initWithWindow:window
                        parentWindow:[self getExpectedParentWindow]
                          anchoredAt:NSZeroPoint])) {
     [self setShouldCloseOnResignKey:NO];
     [self setShouldOpenAsKeyWindow:YES];
     [[self bubble] setArrowLocation:[self getExpectedArrowLocation]];
     bridge_ = bridge;
     NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
@@ skipping 419 matching lines @@
 }
 
 - (IBAction)cancel:(id)sender {
   // This is triggered by ESC when the bubble has focus.
   DCHECK(delegate_);
   delegate_->Closing();
   [super cancel:sender];
 }
 
 @end  // implementation PermissionBubbleController