MacViews: Bubbles and dialogs behave more like sheets wrt main status

ui/views/cocoa/native_widget_mac_nswindow.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 "ui/views/cocoa/native_widget_mac_nswindow.h"
 
 #include "base/mac/foundation_util.h"
 #import "ui/base/cocoa/user_interface_item_command_handler.h"
 #import "ui/views/cocoa/views_nswindow_delegate.h"
 #include "ui/views/controls/menu/menu_controller.h"
@@ skipping 65 matching lines @@
 // Note these can be called via -[NSWindow close] while the widget is being torn
 // down, so check for a delegate.
 - (BOOL)canBecomeKeyWindow {
   return [self delegate] && [self viewsWidget]->CanActivate();
 }
 
 - (BOOL)canBecomeMainWindow {
   if (![self delegate])
     return NO;
 
-  // Dialogs shouldn't take large shadows away from their parent window.
+  // Dialogs and bubbles shouldn't take large shadows away from their parent.
   views::Widget* widget = [self viewsWidget];
-  return widget->CanActivate() && !widget->IsDialogBox();
+  return widget->CanActivate() && ![self parentWindow];
+}
+
+// Lets the traffic light buttons on the parent window keep their active state.
+- (BOOL)_sharesParentKeyState {
+  // Follow -canBecomeMainWindow unless the window provides its own buttons.
+  return ([self styleMask] & NSClosableWindowMask) == 0 &&
+         ![self canBecomeMainWindow];
 }
 
 // Override sendEvent to allow key events to be forwarded to a toolkit-views
 // menu while it is active, and while still allowing any native subview to
 // retain firstResponder status.
 - (void)sendEvent:(NSEvent*)event {
   // Let CommandDispatcher check if this is a redispatched event.
   if ([commandDispatcher_ preSendEvent:event])
     return;
 
@@ skipping 93 matching lines @@
       [item action] == @selector(commandDispatchUsingKeyModifiers:)) {
     return commandHandler_
                ? [commandHandler_ validateUserInterfaceItem:item window:self]
                : [[NSApp delegate] validateUserInterfaceItem:item];
   }
 
   return [super validateUserInterfaceItem:item];
 }
 
 @end