Refactored ExtensionUninstallDialog to take a NativeWindow instead of a Browser

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 27 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,
-    Browser* browser,
+    gfx::NativeWindow parent,
     ExtensionUninstallDialog::Delegate* delegate)
     : profile_(profile),
-      browser_(browser),
+      parent_(parent),
       delegate_(delegate),
       extension_(NULL),
       triggering_extension_(NULL),
       state_(kImageIsLoading),
       ui_loop_(base::MessageLoop::current()) {
-  if (browser) {
-    registrar_.Add(this,
-                   chrome::NOTIFICATION_BROWSER_CLOSED,
-                   content::Source<Browser>(browser));
-  }
+}
+
+void ExtensionUninstallDialog::RegisterObserver(Browser* browser) {

[sashab, 2014/07/21 02:50:30]

We can actually remove the need for the Browser object at all, using
chrome::FindBrowserWithWindow(parent). However, if parent is NULL, we have no
way of knowing whether it was meant to be a browser or not, since the parent can
be NULL but the browser can be not null.

+  // Close the dialog if the browser is closed while the dialog is open.
+  registrar_.Add(this,
+                 chrome::NOTIFICATION_BROWSER_CLOSED,
+                 content::Source<Browser>(browser));
+
+  // If there are no open browser windows, close the dialog immediately.
+  if (!browser->window())
+    delegate_->ExtensionUninstallCanceled();
 }
 
 ExtensionUninstallDialog::~ExtensionUninstallDialog() {
 }
 
 void ExtensionUninstallDialog::ConfirmProgrammaticUninstall(
     const Extension* extension,
     const Extension* triggering_extension) {
   triggering_extension_ = triggering_extension;
   ConfirmUninstall(extension);
@@ skipping 60 matching lines @@
     Show();
   }
 }
 
 void ExtensionUninstallDialog::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(type == chrome::NOTIFICATION_BROWSER_CLOSED);
 
-  browser_ = NULL;
   // If the browser is closed while waiting for the image, we need to send a
   // "cancel" event here, because there will not be another opportunity to
   // notify the delegate of the cancellation as we won't open the dialog.
   if (state_ == kImageIsLoading) {
     state_ = kBrowserIsClosing;
     delegate_->ExtensionUninstallCanceled();
   }
 }
 
 std::string ExtensionUninstallDialog::GetHeadingText() {
   if (triggering_extension_) {
     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