Fix the bug that minimized panel window might steal focus on Mac

chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
@@ skipping 78 matching lines @@
       [controller activationRequestedByPanel] ||
       [app isCyclingWindows] ||
       [app previousKeyWindow] == self ||
       [[app windows] count] == static_cast<NSUInteger>([controller numPanels]);
 }
 
 - (void)performMiniaturize:(id)sender {
   [[self windowController] minimizeButtonClicked:0];
 }
 
-// Ignore key events if window cannot become key window to fix problem
-// where keyboard input is still going into a minimized panel even though
-// the app has been deactivated in -[PanelWindowControllerCocoa deactivate:].
-- (void)sendEvent:(NSEvent*)anEvent {
-  NSEventType eventType = [anEvent type];
-  if ((eventType == NSKeyDown || eventType == NSKeyUp) &&
-      ![self canBecomeKeyWindow])
-    return;
-  [super sendEvent:anEvent];
-}
-
 - (void)mouseMoved:(NSEvent*)event {
   // Cocoa does not support letting the application determine the edges that
   // can trigger the user resizing. To work around this, we track the mouse
   // location. When it is close to the edge/corner where the user resizing
   // is not desired, we force the min and max size of the window to be same
   // as current window size. For all other cases, we restore the min and max
   // size.
   PanelWindowControllerCocoa* controller =
       base::mac::ObjCCast<PanelWindowControllerCocoa>([self windowController]);
   NSRect frame = [self frame];
@@ skipping 484 matching lines @@
 
 - (void)windowDidResignKey:(NSNotification*)notification {
   // If our app is still active and we're still the key window, ignore this
   // message, since it just means that a menu extra (on the "system status bar")
   // was activated; we'll get another |-windowDidResignKey| if we ever really
   // lose key window status.
   if ([NSApp isActive] && ([NSApp keyWindow] == [self window]))
     return;
 
   [self onWindowDidResignKey];
-
-  // Make the window not user-resizable when it loses the focus. This is to
-  // solve the problem that the bottom edge of the active panel does not
-  // trigger the user-resizing if this panel stacks with another inactive
-  // panel at the bottom.
-  [[self window] setStyleMask:
-      [[self window] styleMask] & ~NSResizableWindowMask];
 }
 
 - (void)windowWillStartLiveResize:(NSNotification*)notification {
   // Check if the user-resizing is allowed for the triggering edge/corner.
   // This is an extra safe guard because we are not able to track the mouse
   // movement outside the window and Cocoa could trigger the user-resizing
   // when the mouse moves a bit outside the edge/corner.
   if (![self canResizeByMouseAtCurrentLocation])
     return;
   userResizing_ = YES;
@@ skipping 85 matching lines @@
   // Activate the window. -|windowDidBecomeKey:| will be called when
   // window becomes active.
   base::AutoReset<BOOL> pin(&activationRequestedByPanel_, true);
   [BrowserWindowUtils activateWindowForController:self];
 }
 
 - (void)deactivate {
   if (![[self window] isMainWindow])
     return;
 
-  // Cocoa does not support deactivating a window, so we deactivate the app.
   [NSApp deactivate];
 
-  // Deactivating the app does not trigger windowDidResignKey. Do it manually.
+  // Cocoa does not support deactivating a NSWindow explicitly. To work around
+  // this, we call orderOut and orderFront to force the window to lose its key
+  // window state.
+
+  // Before doing this, we need to disable screen updates to prevent flickering.
+  NSDisableScreenUpdates();
+
+  // If a panel is in stacked mode, the window has a background parent window.
+  // We need to detach it from its parent window before applying the ordering
+  // change and then put it back because otherwise tha background parent window
+  // might show up.
+  NSWindow* parentWindow = [[self window] parentWindow];
+  if (parentWindow)
+    [parentWindow removeChildWindow:[self window]];
+
+  [[self window] orderOut:nil];
+  [[self window] orderFront:nil];
+
+  if (parentWindow)
+    [parentWindow addChildWindow:[self window] ordered:NSWindowAbove];
+
+  NSEnableScreenUpdates();
+
+  // Though the above workaround causes the window to lose its key window state,
+  // it does not trigger the system to call windowDidResignKey.
   [self onWindowDidResignKey];
 }
 
 - (void)onWindowDidResignKey {
   // We need to deactivate the controls (in the "WebView"). To do this, get the
   // selected WebContents's RenderWidgetHostView and tell it to deactivate.
   if (WebContents* contents = windowShim_->panel()->GetWebContents()) {
     if (content::RenderWidgetHostView* rwhv =
         contents->GetRenderWidgetHostView())
       rwhv->SetActive(false);
   }
 
   windowShim_->panel()->OnActiveStateChanged(false);
+
+  // Make the window not user-resizable when it loses the focus. This is to
+  // solve the problem that the bottom edge of the active panel does not
+  // trigger the user-resizing if this panel stacks with another inactive
+  // panel at the bottom.
+  [[self window] setStyleMask:
+      [[self window] styleMask] & ~NSResizableWindowMask];
 }
 
 - (void)preventBecomingKeyWindow:(BOOL)prevent {
   canBecomeKeyWindow_ = !prevent;
 }
 
 - (void)fullScreenModeChanged:(bool)isFullScreen {
   [self updateWindowLevel];
 
   // If the panel is not always on top, its z-order should not be affected if
@@ skipping 155 matching lines @@
 - (NSRect)contentRectForFrameRect:(NSRect)frameRect {
   NSRect contentRect = [[[self window] contentView] convertRect:frameRect
                                                        fromView:nil];
   contentRect.size.height -= panel::kTitlebarHeight;
   if (contentRect.size.height < 0)
     contentRect.size.height = 0;
   return contentRect;
 }
 
 @end