Close new bubbles on deactivate; disable rendering Chrome inactive.

views/widget/native_widget_win.cc

 // Copyright (c) 2011 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 "views/widget/native_widget_win.h"
 
 #include <dwmapi.h>
 #include <shellapi.h>
 
 #include <algorithm>
@@ skipping 815 matching lines @@
   SetWindowRgn(region, TRUE);
 }
 
 void NativeWidgetWin::Close() {
   if (!IsWindow())
     return;  // No need to do anything.
 
   // Let's hide ourselves right away.
   Hide();
 
+  // Modal dialog windows disable their owner windows; re-enable them now so
+  // they can activate as foreground windows upon this window's destruction.
+  RestoreEnabledIfNecessary();
+
   if (!close_widget_factory_.HasWeakPtrs()) {
     // And we delay the close so that if we are called from an ATL callback,
     // we don't destroy the window before the callback returned (as the caller
     // may delete ourselves on destroy and the ATL callback would still
     // dereference us when the callback returns).
     MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&NativeWidgetWin::CloseNow,
                    close_widget_factory_.GetWeakPtr()));
   }
-
-  // If the user activates another app after opening us, then comes back and
-  // closes us, we want our owner to gain activation.  But only if the owner
-  // is visible. If we don't manually force that here, the other app will
-  // regain activation instead.
-  // It's tempting to think that this could be done from OnDestroy, but by then
-  // it's too late - GetForegroundWindow() will return the window that Windows
-  // has decided to re-activate for us instead of this dialog. It's also
-  // tempting to think about removing the foreground window check entirely, but
-  // it's necessary to this code path from being triggered when an inactive
-  // window is closed.
-  HWND owner = ::GetWindow(GetNativeView(), GW_OWNER);
-  if (owner && GetNativeView() == GetForegroundWindow() &&
-      IsWindowVisible(owner)) {
-    SetForegroundWindow(owner);
-  }
 }
 
 void NativeWidgetWin::CloseNow() {
   // We may already have been destroyed if the selection resulted in a tab
   // switch which will have reactivated the browser window and closed us, so
   // we need to check to see if we're still a window before trying to destroy
   // ourself.
   if (IsWindow())
     DestroyWindow(hwnd());
 }
@@ skipping 436 matching lines @@
 #endif
 
   delegate_->OnNativeWidgetCreated();
 
   // Get access to a modifiable copy of the system menu.
   GetSystemMenu(hwnd(), false);
   return 0;
 }
 
 void NativeWidgetWin::OnDestroy() {
-  RestoreEnabledIfNecessary();
   delegate_->OnNativeWidgetDestroying();
   if (drop_target_.get()) {
     RevokeDragDrop(hwnd());
     drop_target_ = NULL;
   }
 }
 
 void NativeWidgetWin::OnDisplayChange(UINT bits_per_pixel, CSize screen_size) {
   GetWidget()->widget_delegate()->OnDisplayChanged();
 }
@@ skipping 269 matching lines @@
   GetWidget()->widget_delegate()->OnWidgetMove();
   SetMsgHandled(FALSE);
 }
 
 void NativeWidgetWin::OnMoving(UINT param, const LPRECT new_bounds) {
   // TODO(beng): move to Widget.
   GetWidget()->widget_delegate()->OnWidgetMove();
 }
 
 LRESULT NativeWidgetWin::OnNCActivate(BOOL active) {
+  if (delegate_->CanActivate())
+    delegate_->OnNativeWidgetActivationChanged(!!active);
+
   if (!GetWidget()->non_client_view()) {
     SetMsgHandled(FALSE);
     return 0;
   }
 
   if (!delegate_->CanActivate())
     return TRUE;
 
-  delegate_->OnNativeWidgetActivationChanged(!!active);
-
   // The frame may need to redraw as a result of the activation change.
   // We can get WM_NCACTIVATE before we're actually visible. If we're not
   // visible, no need to paint.
   if (IsVisible())
     GetWidget()->non_client_view()->SchedulePaint();
 
   if (!GetWidget()->ShouldUseNativeFrame()) {
     // TODO(beng, et al): Hack to redraw this window and child windows
     //     synchronously upon activation. Not all child windows are redrawing
     //     themselves leading to issues like http://crbug.com/74604
@@ skipping 641 matching lines @@
       } else if (can_resize) {
         style |= WS_OVERLAPPED | WS_THICKFRAME;
       }
       if (delegate_->IsDialogBox()) {
         style |= DS_MODALFRAME;
         // NOTE: Turning this off means we lose the close button, which is bad.
         // Turning it on though means the user can maximize or size the window
         // from the system menu, which is worse. We may need to provide our own
         // menu to get the close button to appear properly.
         // style &= ~WS_SYSMENU;
+
+        // Set the WS_POPUP style for modal dialogs. This ensures that the owner
+        // window is activated on destruction. This style should not be set for
+        // non-modal non-top-level dialogs like constrained windows.
+        style |= delegate_->IsModal() ? WS_POPUP : 0;
       }
       ex_style |= delegate_->IsDialogBox() ? WS_EX_DLGMODALFRAME : 0;
       break;
     }
     case Widget::InitParams::TYPE_CONTROL:
       style |= WS_VISIBLE;
       break;
     case Widget::InitParams::TYPE_WINDOW_FRAMELESS:
       style |= WS_POPUP;
       break;
@@ skipping 335 matching lines @@
   return (GetKeyState(VK_LBUTTON) & 0x80) ||
     (GetKeyState(VK_RBUTTON) & 0x80) ||
     (GetKeyState(VK_MBUTTON) & 0x80) ||
     (GetKeyState(VK_XBUTTON1) & 0x80) ||
     (GetKeyState(VK_XBUTTON2) & 0x80);
 }
 
 }  // namespace internal
 
 }  // namespace views