[Merge] Cancel uninstall if the uninstall dialog's parent window is destroyed prior to the uninstal…

chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.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 "chrome/browser/extensions/extension_uninstall_dialog.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "chrome/grit/generated_resources.h"
 #include "extensions/common/extension.h"
+#include "ui/aura/window_tracker.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/layer.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
 namespace {
 
 const int kRightColumnWidth = 210;
 const int kIconSize = 64;
 
 class ExtensionUninstallDialogDelegateView;
 
 // Views implementation of the uninstall dialog.
 class ExtensionUninstallDialogViews
     : public extensions::ExtensionUninstallDialog {
  public:
   ExtensionUninstallDialogViews(
       Profile* profile,
-      gfx::NativeWindow parent,
+      aura::Window* parent,
       extensions::ExtensionUninstallDialog::Delegate* delegate);
   virtual ~ExtensionUninstallDialogViews();
 
   // Called when the ExtensionUninstallDialogDelegate has been destroyed to make
   // sure we invalidate pointers.
   void DialogDelegateDestroyed() { view_ = NULL; }
 
   // Forwards the accept and cancels to the delegate.
   void ExtensionUninstallAccepted();
   void ExtensionUninstallCanceled();
 
  private:
   virtual void Show() OVERRIDE;
 
   ExtensionUninstallDialogDelegateView* view_;
 
+  // The dialog's parent window.
+  aura::Window* parent_;
+
+  // Tracks whether |parent_| got destroyed.
+  aura::WindowTracker parent_window_tracker_;
+
   DISALLOW_COPY_AND_ASSIGN(ExtensionUninstallDialogViews);
 };
 
 // The dialog's view, owned by the views framework.
 class ExtensionUninstallDialogDelegateView : public views::DialogDelegateView {
  public:
   ExtensionUninstallDialogDelegateView(
       ExtensionUninstallDialogViews* dialog_view,
       const extensions::Extension* extension,
       const extensions::Extension* triggering_extension,
@@ skipping 31 matching lines @@
 
   views::ImageView* icon_;
   views::Label* heading_;
   bool triggered_by_extension_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionUninstallDialogDelegateView);
 };
 
 ExtensionUninstallDialogViews::ExtensionUninstallDialogViews(
     Profile* profile,
-    gfx::NativeWindow parent,
+    aura::Window* parent,
     extensions::ExtensionUninstallDialog::Delegate* delegate)
-    : extensions::ExtensionUninstallDialog(profile, parent, delegate),
-      view_(NULL) {
+    : extensions::ExtensionUninstallDialog(profile, delegate),
+      view_(NULL),
+      parent_(parent) {
+  if (parent_)
+    parent_window_tracker_.Add(parent_);
 }
 
 ExtensionUninstallDialogViews::~ExtensionUninstallDialogViews() {
   // Close the widget (the views framework will delete view_).
   if (view_) {
     view_->DialogDestroyed();
     view_->GetWidget()->CloseNow();
   }
 }
 
 void ExtensionUninstallDialogViews::Show() {
+  if (parent_ && !parent_window_tracker_.Contains(parent_)) {
+    delegate_->ExtensionUninstallCanceled();
+    return;
+  }
+
   view_ = new ExtensionUninstallDialogDelegateView(
       this, extension_, triggering_extension_, &icon_);
   CreateBrowserModalDialogViews(view_, parent_)->Show();
 }
 
 void ExtensionUninstallDialogViews::ExtensionUninstallAccepted() {
   // The widget gets destroyed when the dialog is accepted.
   view_->DialogDestroyed();
   view_ = NULL;
   delegate_->ExtensionUninstallAccepted();
@@ skipping 103 matching lines @@
 
 }  // namespace
 
 // static
 extensions::ExtensionUninstallDialog*
 extensions::ExtensionUninstallDialog::Create(Profile* profile,
                                              gfx::NativeWindow parent,
                                              Delegate* delegate) {
   return new ExtensionUninstallDialogViews(profile, parent, delegate);
 }