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

chrome/browser/extensions/extension_uninstall_dialog.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/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 21 matching lines @@
   const gfx::ImageSkia& image =
       is_app ? util::GetDefaultAppIcon() : util::GetDefaultExtensionIcon();
   return image.GetRepresentation(
       gfx::ImageSkia::GetMaxSupportedScale()).sk_bitmap();
 }
 
 }  // namespace
 
 ExtensionUninstallDialog::ExtensionUninstallDialog(
     Profile* profile,
-    gfx::NativeWindow parent,
     ExtensionUninstallDialog::Delegate* delegate)
     : profile_(profile),
-      parent_(parent),
       delegate_(delegate),
       extension_(NULL),
       triggering_extension_(NULL),
       ui_loop_(base::MessageLoop::current()) {
 }
 
 ExtensionUninstallDialog::~ExtensionUninstallDialog() {
 }
 
 void ExtensionUninstallDialog::ConfirmProgrammaticUninstall(
@@ skipping 63 matching lines @@
     return l10n_util::GetStringFUTF8(
         IDS_EXTENSION_PROGRAMMATIC_UNINSTALL_PROMPT_HEADING,
         base::UTF8ToUTF16(triggering_extension_->name()),
         base::UTF8ToUTF16(extension_->name()));
   }
   return l10n_util::GetStringFUTF8(IDS_EXTENSION_UNINSTALL_PROMPT_HEADING,
                                    base::UTF8ToUTF16(extension_->name()));
 }
 
 }  // namespace extensions