Implement WebContentsModalDialogManagerDelegate for ShellWindow

chrome/browser/ui/views/web_contents_modal_dialog_manager_views.cc

 // 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 <set>
 
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/native_web_contents_modal_dialog_manager.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
@@ skipping 86 matching lines @@
     // We don't necessarily have a RootWindow yet.
     if (widget->GetNativeView()->GetRootWindow())
       widget->GetNativeView()->Focus();
 #endif
   }
 
   virtual void PulseDialog(NativeWebContentsModalDialog dialog) OVERRIDE {
   }
 
   // views::WidgetObserver overrides
+
+  // NOTE(wittman): OnWidgetClosing is overriden to ensure that, when the widget
+  // is explicitly closed, the destruction occurs within the same call
+  // stack. This avoids event races that lead to non-deterministic destruction
+  // ordering in e.g. the print preview dialog. OnWidgetDestroying is overridden
+  // because OnWidgetClosing is *only* invoked on explicit close, not when the
+  // widget is implicitly destroyed due to its parent being closed. This
+  // situation occurs with app windows.  WidgetClosing removes the observer, so
+  // only one of these two functions is ever invoked for a given widget.
   virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE {
+    WidgetClosing(widget);
+  }
+
+  virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE {
+    WidgetClosing(widget);
+  }
+
+ private:
+  static views::Widget* GetWidget(NativeWebContentsModalDialog dialog) {
+    views::Widget* widget = views::Widget::GetWidgetForNativeWindow(dialog);
+    DCHECK(widget);
+    return widget;
+  }
+
+  void WidgetClosing(views::Widget* widget) {
 #if defined(USE_ASH)
     gfx::NativeView view = platform_util::GetParent(widget->GetNativeView());
     // Allow the parent to animate again.
     if (view && view->parent())
       view->parent()->ClearProperty(aura::client::kAnimationsDisabledKey);
 #endif
     widget->RemoveObserver(this);
     native_delegate_->WillClose(widget->GetNativeView());
     observed_widgets_.erase(widget);
   }
 
- private:
-  static views::Widget* GetWidget(NativeWebContentsModalDialog dialog) {
-    views::Widget* widget = views::Widget::GetWidgetForNativeWindow(dialog);
-    DCHECK(widget);
-    return widget;
-  }
-
   NativeWebContentsModalDialogManagerDelegate* native_delegate_;
   std::set<views::Widget*> observed_widgets_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeWebContentsModalDialogManagerViews);
 };
 
 }  // namespace
 
 NativeWebContentsModalDialogManager* WebContentsModalDialogManager::
 CreateNativeManager(
     NativeWebContentsModalDialogManagerDelegate* native_delegate) {
   return new NativeWebContentsModalDialogManagerViews(native_delegate);
 }